Skip to content

Commit 76c0e9f

Browse files
authored
Merge pull request #713 from fortanix/raoul/rte-381-pin_rust_compiler_for_ci
[RTE-381] Pin to `nightly-2025-02-22` compiler for some CI tests
2 parents 6ddb173 + 8f184be commit 76c0e9f

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,15 @@ jobs:
5151
rustup toolchain add nightly
5252
rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly
5353
rustup update
54+
# nightly-2025-02-22 and following are buggy which causes some crates not to compile
55+
rustup install nightly-2025-02-22
56+
rustup +nightly-2025-02-22 target add x86_64-fortanix-unknown-sgx
5457
5558
- name: Cargo test --all --exclude sgxs-loaders
5659
run: cargo test --verbose --locked --all --exclude sgxs-loaders --exclude async-usercalls && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
5760

5861
- name: cargo test -p async-usercalls --target x86_64-fortanix-unknown-sgx --no-run
59-
run: cargo +nightly test --verbose --locked -p async-usercalls --target x86_64-fortanix-unknown-sgx --no-run
62+
run: cargo +nightly-2025-02-22 test --verbose --locked -p async-usercalls --target x86_64-fortanix-unknown-sgx --no-run
6063

6164
- name: Nightly test -p dcap-artifact-retrieval --target x86_64-fortanix-unknown-sgx --no-default-features --no-run
6265
run: cargo +nightly test --verbose --locked -p dcap-artifact-retrieval --target x86_64-fortanix-unknown-sgx --no-default-features --no-run

doc/generate-api-docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ for LIB in $LIBS_SORTED; do
6161
if grep -q 'feature(sgx_platform)' ./src/lib.rs; then
6262
ARGS+=" --target x86_64-fortanix-unknown-sgx"
6363
fi
64-
cargo +nightly doc --no-deps --lib $ARGS
64+
cargo +nightly-2025-02-22 doc --no-deps --lib $ARGS
6565
popd
6666
fi
6767
done

intel-sgx/fortanix-sgx-abi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ invoke_with_abi_spec!(types);
881881
// function declarations inside all `impl Usercalls` blocks.
882882
macro_rules! define_invoke_with_usercalls {
883883
// collect all usercall function declarations in a list
884-
(@ [$($accumulated:tt)*] $(#[$meta1:meta])* impl Usercalls { $($(#[$meta2:meta])* pub fn $f:ident($($n:ident: $t:ty),*) $(-> $r:tt)* { unimplemented!() } )* } $($remainder:tt)* ) =>
884+
(@ [$($accumulated:tt)*] $(#[$meta1:meta])* impl Usercalls { $($(#[$meta2:meta])* pub fn $f:ident($($n:ident: $t:ty),*) $(-> $r:ty)* { unimplemented!() } )* } $($remainder:tt)* ) =>
885885
{ define_invoke_with_usercalls!(@ [$($accumulated)* $(fn $f($($n: $t),*) $(-> $r)*;)*] $($remainder)*); };
886886
// visit modules
887887
(@ $accumulated:tt $(#[$meta:meta])* pub mod $modname:ident { $($contents:tt)* } $($remainder:tt)*) =>

0 commit comments

Comments
 (0)