From 8a85c85f73c331b2fb07e9445d6dbbd526a27dde Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Mon, 2 Dec 2024 11:12:37 +0200 Subject: [PATCH 1/3] chore(ci): set rust version to 1.82 Signed-off-by: Dori Medini --- rust-toolchain.toml | 2 +- scripts/install_build_tools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 31cfd7b24a..2ec56f0497 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "stable" +channel = "1.82.0" components = ["clippy", "rustc-dev", "rustfmt"] profile = "default" targets = ["x86_64-unknown-linux-gnu"] diff --git a/scripts/install_build_tools.sh b/scripts/install_build_tools.sh index cdbca6f790..8bbb8dbdcf 100755 --- a/scripts/install_build_tools.sh +++ b/scripts/install_build_tools.sh @@ -45,7 +45,7 @@ function install_pypy() { } function install_rust() { - curl https://sh.rustup.rs -sSf | sh -s -- -y + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.82.0 } cd "$(dirname "$0")" From c7918f899341ad796c38f76ff6660d7a3d424acb Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Mon, 2 Dec 2024 11:19:06 +0200 Subject: [PATCH 2/3] tmp: purge cache Signed-off-by: Dori Medini --- .github/actions/install_rust/action.yml | 6 +++++- .../src/execution/syscalls/syscall_tests/emit_event.rs | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/install_rust/action.yml b/.github/actions/install_rust/action.yml index c81c5ac569..6738bea5db 100644 --- a/.github/actions/install_rust/action.yml +++ b/.github/actions/install_rust/action.yml @@ -6,4 +6,8 @@ runs: steps: - uses: moonrepo/setup-rust@v1 with: - cache-base: main(-v[0-9].*)? + cache: false + inherit-toolchain: true + # with: + # cache-base: main(-v[0-9].*)? + # inherit-toolchain: true diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs index 46e7564bd2..b0b96f2ae0 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs @@ -26,6 +26,7 @@ const DATA: [Felt; 3] = [ ]; const N_EMITTED_EVENTS: [Felt; 1] = [Felt::from_hex_unchecked("0x1")]; +// Tmp. #[cfg_attr(feature = "cairo_native", test_case(CairoVersion::Native;"Native"))] #[test_case(CairoVersion::Cairo1;"VM")] fn positive_flow(cairo_version: CairoVersion) { From 77dab148753e6e735924eb727b8493565f2f8566 Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Mon, 2 Dec 2024 13:54:07 +0200 Subject: [PATCH 3/3] tmp: try 1.81 Signed-off-by: Dori Medini --- rust-toolchain.toml | 2 +- scripts/install_build_tools.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 2ec56f0497..7d82247b14 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.82.0" +channel = "1.81.0" components = ["clippy", "rustc-dev", "rustfmt"] profile = "default" targets = ["x86_64-unknown-linux-gnu"] diff --git a/scripts/install_build_tools.sh b/scripts/install_build_tools.sh index 8bbb8dbdcf..b84db87627 100755 --- a/scripts/install_build_tools.sh +++ b/scripts/install_build_tools.sh @@ -45,7 +45,7 @@ function install_pypy() { } function install_rust() { - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.82.0 + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.81.0 } cd "$(dirname "$0")"