Skip to content

Commit 4f3cd1c

Browse files
committed
fix CI bug by updating toolchain
1 parent a6d29c2 commit 4f3cd1c

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/rapx.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches: [main,rapx-verify-std]
99

1010
env:
11-
RAPx_VERSION: "2f8cefc8a4bbd7c347e02e97c61de1d8224776ba"
11+
RAPx_VERSION: "05c016bcb13889119c94890821c2203d175b9a85"
1212
SAFETY_TOOL_VERSION: "6b77419da66865bb5a36b6c9baec71b3e833d3c9"
1313

1414
jobs:
@@ -21,15 +21,18 @@ jobs:
2121

2222
- name: Clone and setup safety_tool
2323
run: |
24-
git clone https://github.com/Artisan-Lab/tag-std.git
24+
git clone https://github.com/safer-rust/tag-std.git
2525
cd tag-std
2626
git checkout $SAFETY_TOOL_VERSION
2727
cargo install cargo-expand
2828
cd safety-tool
2929
TOOL_DIR=$(pwd)
3030
echo "TOOL_DIR=$TOOL_DIR" >> $GITHUB_ENV
3131
rm -f rust-toolchain.toml
32-
./gen_rust_toolchain_toml.rs std
32+
echo '[toolchain]' > rust-toolchain.toml
33+
echo 'channel = "nightly-2025-10-09"' >> rust-toolchain.toml
34+
echo 'components = ["rust-src", "rustc-dev", "llvm-tools-preview"]' >> rust-toolchain.toml
35+
# ./gen_rust_toolchain_toml.rs std
3336
3437
- name: Install safety_tool
3538
run: |
@@ -51,8 +54,12 @@ jobs:
5154
5255
- name: Set up RAPx environment
5356
run: |
57+
cd RAPx
5458
RUSTUP_TOOLCHAIN=$(rustup show active-toolchain | cut -d ' ' -f 1)
5559
echo "RUSTUP_TOOLCHAIN=$RUSTUP_TOOLCHAIN" >> $GITHUB_ENV
60+
RAPX_SYSROOT=$(rustc --print sysroot)
61+
echo "RAPX_LD_LIBRARY_PATH=$RAPX_SYSROOT/lib" >> $GITHUB_ENV
62+
cd ..
5663
CURRENT_DIR=$(pwd)
5764
RUST_SRC_PATH="$CURRENT_DIR/library"
5865
echo "__CARGO_TESTS_ONLY_SRC_ROOT=$RUST_SRC_PATH" >> $GITHUB_ENV
@@ -61,6 +68,6 @@ jobs:
6168
run: |
6269
cargo new dummy_crate
6370
cd dummy_crate
64-
export LD_LIBRARY_PATH=$(rustc +$RUSTUP_TOOLCHAIN --print sysroot)/lib
71+
export LD_LIBRARY_PATH=$RAPX_LD_LIBRARY_PATH
6572
export RUSTFLAGS="--cfg=rapx -L $TOOL_DIR/target/safety-tool/lib --extern=safety_macro -Zcrate-attr=feature(register_tool) -Zcrate-attr=register_tool(rapx)"
66-
cargo +$RUSTUP_TOOLCHAIN rapx -verify-std -- -Zbuild-std=panic_abort,core,std --target x86_64-unknown-linux-gnu
73+
cargo +$RUSTUP_TOOLCHAIN rapx check --verify-std -- -Zbuild-std=panic_abort,core,std --target x86_64-unknown-linux-gnu

0 commit comments

Comments
 (0)