Go back to static link as default

facebookexperimental · Oct 24, 2023 · 5a314e7 · 5a314e7
1 parent ebe0186
commit 5a314e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/mirai_on_mirai.yml b/.github/workflows/mirai_on_mirai.yml
@@ -50,7 +50,7 @@ jobs:
           extra-args: --clean-buildtrees-after-build
       - name: Install MIRAI
         run: |
-          cargo install --force --path ./checker
+          cargo install --force --path ./checker --no-default-features --features vcpkg
       - name: Run MIRAI on MIRAI
         run: |
-          cargo mirai
+          cargo mirai --no-default-features
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Execute tests
         run: |
-          cargo test --all -- --test-threads=1
+          cargo test --all -- --no-default-features --features vcpkg --test-threads=1
         env:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests"
@@ -67,7 +67,7 @@ jobs:
 
       - name: Install MIRAI
         run: |
-          cargo install --force --path ./checker --no-default-features --features static-link-z3
+          cargo install --force --path ./checker
 
       - name: Run MIRAI on MIRAI
         run: |

diff --git a/checker/Cargo.toml b/checker/Cargo.toml
@@ -64,7 +64,7 @@ walkdir = "*"
 contracts = { version = "0.6.0", features = ["mirai_assertions"] }
 
 [features]
-default = ["z3"]
-z3 = ["z3-sys/vcpkg"]
+default = ["static-link-z3"]
+vcpkg = ["z3-sys/vcpkg"]
 static-link-z3 = ["z3-sys/static-link-z3"]