diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 07f51f8..ed163f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,52 +32,3 @@ jobs: - name: Build run: cmake --build --preset ${{ matrix.target }} --config Release - - build-windows: - runs-on: windows-2022 - strategy: - fail-fast: false - matrix: - target: [windows-x64, windows-arm64] - steps: - - uses: actions/checkout@v4 - - - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: x64 - - - name: Add Clang to PATH - run: echo "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin" >> $env:GITHUB_PATH - - - name: Upload Error Log - if: always() # Run even if the build failed - uses: actions/upload-artifact@v4 - with: - name: error-log - path: D:\a\IACore\IACore\out\build\windows-x64\vcpkg_installed\vcpkg\blds\detect_compiler\config-windows-x64-clang-out.log - - - name: Setup VCPKG - run: | - git clone https://github.com/microsoft/vcpkg.git C:/vcpkg - C:/vcpkg/bootstrap-vcpkg.bat - echo "VCPKG_ROOT=C:/vcpkg" >> $env:GITHUB_ENV - - - uses: ilammy/setup-nasm@v1 - - - name: Cache vcpkg - uses: actions/cache@v4 - with: - path: out/build/${{ matrix.target }}/vcpkg_installed - key: vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('vcpkg.json') }} - - - name: Build - shell: cmd - run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake --preset ${{ matrix.target }} - cmake --build --preset ${{ matrix.target }} --config Debug - - - name: Setup tmate session - if: failure() - uses: mxschmitt/action-tmate@v3 - diff --git a/vcpkg.json b/vcpkg.json index 90e24b4..bbb54ac 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,7 +4,12 @@ "builtin-baseline": "37dcabc43809a960f41758e00e615cc6e26e8bbf", "dependencies": [ "openssl", - "zlib-ng", - "zstd" + "zstd", + { + "name": "zlib-ng", + "features": [ + "compat" + ] + } ] } \ No newline at end of file