Merge branch 'master' of https://github.com/z3prover/z3

Z3Prover · Dec 19, 2023 · d088fe9 · d088fe9
2 parents 9a18628 + 5cafda1
commit d088fe9
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -9,36 +9,24 @@ jobs:
         arch : [x86,x64,amd64_arm64]
         include:
          - arch : x86
-           bindings : -DZ3_BUILD_PYTHON_BINDINGS=True
+           bindings : '-DZ3_BUILD_PYTHON_BINDINGS=True'
          - arch : x64
            cmd1 : 'julia -e "using Pkg; Pkg.add(PackageSpec(name=\"libcxxwrap_julia_jll\", version=\"0.7.0\"))"'
            cmd2 : 'julia -e "using libcxxwrap_julia_jll; print(dirname(libcxxwrap_julia_jll.libcxxwrap_julia_path))" > tmp.env'
            cmd3 : 'set /P JlCxxDir=<tmp.env'
            bindings: '-DJlCxx_DIR=%JlCxxDir%\..\lib\cmake\JlCxx $(cmakeJava) $(cmakeNet) $(cmakePy) -DCMAKE_BUILD_TYPE=RelWithDebInfo'
          - arch : amd64_arm64
-           bindings: -DZ3_BUILD_PYTHON_BINDINGS=True
+           bindings: '-DZ3_BUILD_PYTHON_BINDINGS=True'
 
     runs-on: windows-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Create build directory
-        run: md build
       - name: Build
-        run:  cd build
-      - name: cmd1
-        if: ${{ matrix.cmd1 }}
-        run: ${{ matrix.cmd1 }}
-      - name: cmd2
-        if: ${{ matrix.cmd2 }}
-        run: ${{ matrix.cmd2 }}
-      - name: cmd3
-        if: ${{ matrix.cmd3 }}
-        run: ${{ matrix.cmd3 }}  
-      - name: Setup Visual Studio environment
-        run: |
+        run: |          
+          md build
+          cd build
           cmd /c "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }}            
-      - name: configure
-        run: cmake .. ${{ matrix.bindings }} -G "NMake Makefiles"
-      - name: make
-        run: nmake
+          cmake -G "NMake Makefiles" ../
+          nmake        
+