Try specfiying target in .cargo/config.toml

viperproject · Nov 30, 2023 · c106612 · c106612
1 parent 448dc7d
commit c106612
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,3 +3,9 @@ bindeps = true
 
 [registries.crates-io]
 protocol = "sparse"
+
+[build.'cfg(all(windows, target_arch="x86_64", target_env="msvc"))']
+target = "x86_64-pc-windows-msvc"
+
+[test.'cfg(all(windows, target_arch="x86_64", target_env="msvc"))']
+target = "x86_64-pc-windows-msvc"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -254,7 +254,7 @@ jobs:
           restore-keys: ${{ env.VER_CACHE_KEY_SHARED }}
       - name: Build with cargo (Windows)
         if: matrix.os == 'windows-latest'
-        run: python x.py build --all --jobs 1 --target x86_64-pc-windows-msvc
+        run: python x.py build --all --jobs 1
         shell: powershell
 
       - name: Build with cargo (Non-Windows)
@@ -265,7 +265,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: |
           $env:COMPILATION_TARGET_PRUSTI="x86_64-pc-windows-msvc"
-          python x.py test --all --target x86_64-pc-windows-msvc
+          python x.py test --all
         shell: powershell
 
       - name: Run cargo tests (Non-Windows)
@@ -276,7 +276,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: |
           $env:COMPILATION_TARGET_PRUSTI="x86_64-pc-windows-msvc"
-          python x.py test pass/no-annotation --all --verbose --target x86_64-pc-windows-msvc
+          python x.py test pass/no-annotation --all --verbose
         shell: powershell
         env:
           PRUSTI_VIPER_BACKEND: carbon
@@ -325,7 +325,7 @@ jobs:
         run: python x.py setup
 
       - name: Build with cargo --release
-        run: python x.py build --release ${{ matrix.os == 'windows-latest' && '--target x86_64-pc-windows-msvc' || '' }}
+        run: python x.py build --release
 
   # Run Prusti on itself.
   # Disabled because of a bug when compiling jni-gen