Merge branch 'master' into audit-lottery

multiversx · Dec 16, 2024 · 0696382 · 0696382
2 parents 15f9b29 + 42df100
commit 0696382
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v4.1.1
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@72dc7659e6945c8749d01ec28638843bae33437e
     with:
       rust-toolchain: 1.82
       path-to-sc-meta: framework/meta

diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
@@ -23,6 +23,7 @@ path = "src/main.rs"
 [features]
 template-test-current = []
 template-test-released = []
+chain-simulator-tests = []
 
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }

diff --git a/framework/meta/src/cmd/test.rs b/framework/meta/src/cmd/test.rs
@@ -28,7 +28,7 @@ pub fn test(test_args: &TestArgs) {
             args.extend(["--features", "multiversx-sc-scenario/run-go-tests"]);
         }
 
-        if chain_simulator {
+        if chain_simulator && cfg!(feature = "chain-simulator-tests") {
             args.extend(["--features", "chain-simulator-tests"]);
         }