diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d0cf5d..d1e372b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,6 @@ jobs: package_suffix: 'win64' win_arch: "x64" qt_arch: win64_msvc2019_64 - cmake_extra_args: '-DZLIB_ROOT=C:/zlib' qt_tools: tools_ninja, tools_cmake - interface: gui cmake_cli_arg: 'OFF' @@ -52,10 +51,6 @@ jobs: env: qt_installation_path: ${{ github.workspace }} - zlib_path: ${{ github.workspace }}/../zlib-git - zlib_build_path: ${{ github.workspace }}/../build-zlib-git - zlib_installation_path: C:/zlib - zlib_version: "1.3.1" lz4_path: ${{ github.workspace }}/../lz4-git lz4_build_path: ${{ github.workspace }}/../build-lz4-git lz4_installation_path: ${{ github.workspace }}/../lz4 @@ -102,21 +97,6 @@ jobs: run: | echo "PRERELEASE_STRING= unstable build" >> $GITHUB_ENV - - name: Cache Zlib - id: cache-zlib - if: runner.os == 'Windows' - uses: actions/cache@v4 - with: - path: ${{ env.zlib_installation_path }} - key: ${{ runner.os }}${{ matrix.win_arch }}-zlib-${{ env.zlib_version}} - - - name: Install Zlib - if: (runner.os == 'Windows') && (steps.cache-zlib.outputs.cache-hit != 'true') - run: | - git clone -q --depth 1 --single-branch --branch=v${{ env.zlib_version }} https://github.com/madler/zlib ${{ env.zlib_path }} - cmake -S${{ env.zlib_path }} -B${{ env.zlib_build_path }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_INSTALL_PREFIX=${{ env.zlib_installation_path }} - cmake --build ${{ env.zlib_build_path }} --target install -j3 - - name: Cache lz4 id: cache-lz4 uses: actions/cache@v4