Skip to content

Commit

Permalink
Update Zlib to 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sithlord48 committed Jan 6, 2024
1 parent 9e910a3 commit 042dd9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
zlib_path: ${{ github.workspace }}/../zlib-git
zlib_build_path: ${{ github.workspace }}/../build-zlib-git
zlib_installation_path: C:/zlib
zlib_version: "1.3"
ff7tk_installation_path: ${{ github.workspace }}/ff7tk
makoureactor_build_path: ${{ github.workspace }}/../build-makoureactor
makoureactor_installation_path: ${{ github.workspace }}/../installation-makoureactor
Expand Down Expand Up @@ -117,12 +118,12 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.zlib_installation_path }}
key: ${{ runner.os }}${{ matrix.win_arch }}-zlib
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=v1.2.11 https://github.com/madler/zlib ${{ env.zlib_path }}
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
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"name": "zlib",
"version": "1.2.13",
"version": "1.3",
"port-version": 0
}
]
Expand Down

0 comments on commit 042dd9b

Please sign in to comment.