diff --git a/.github/depends/zlib.sh b/.github/depends/zlib.sh index dd76d5f0..fce05159 100755 --- a/.github/depends/zlib.sh +++ b/.github/depends/zlib.sh @@ -27,9 +27,9 @@ while getopts "b:t:p:" c; do done mkdir $prefix || exit 1 -wget https://zlib.net/zlib-1.2.12.tar.gz || exit 1 -tar -xf zlib-1.2.12.tar.gz || exit 1 -cd zlib-1.2.12 +wget https://zlib.net/zlib-1.2.13.tar.gz || exit 1 +tar -xf zlib-1.2.13.tar.gz || exit 1 +cd zlib-1.2.13 build() { diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml index 389b3d17..e632cd05 100644 --- a/.github/workflows/gha.yml +++ b/.github/workflows/gha.yml @@ -25,7 +25,7 @@ jobs: uses: actions/cache@v2 with: path: ~/boost-prefix/ - key: ${{ runner.os }}-boost-1-76-0-2021-08-09 + key: ${{ runner.os }}-boost-1-76-0-2022-08-09 - name: Build boost if: steps.cache-boost.outputs.cache-hit != 'true' @@ -36,7 +36,7 @@ jobs: uses: actions/cache@v2 with: path: ~/zlib-prefix/ - key: ${{ runner.os }}-zlib-1-2-12-2021-08-09 + key: ${{ runner.os }}-zlib-1-2-13-2022-11-02 - name: Build zlib if: steps.cache-zlib.outputs.cache-hit != 'true' @@ -111,7 +111,7 @@ jobs: uses: actions/cache@v2 with: path: ~/zlib-prefix/ - key: ${{ runner.os }}-zlib-1-2-12-2021-08-09 + key: ${{ runner.os }}-zlib-1-2-13-2022-11-02 - name: Build zlib if: steps.cache-zlib.outputs.cache-hit != 'true' diff --git a/appveyor.yml b/appveyor.yml index 602b4954..2a48b237 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,10 +23,10 @@ environment: boost_subdir: lib32-msvc-14.0 build_script: - ps: | - appveyor DownloadFile http://zlib.net/zlib-1.2.12.tar.gz -FileName zlib-1.2.12.tar.gz - 7z x zlib-1.2.12.tar.gz 2> $null - 7z x zlib-1.2.12.tar 2> $null - cd zlib-1.2.12 + appveyor DownloadFile http://zlib.net/zlib-1.2.13.tar.gz -FileName zlib-1.2.13.tar.gz + 7z x zlib-1.2.13.tar.gz 2> $null + 7z x zlib-1.2.13.tar 2> $null + cd zlib-1.2.13 md build md prefix @@ -34,7 +34,7 @@ build_script: cmake ` -G $env:msvc ` - -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" ` + -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.13\prefix" ` .. if ($LastExitCode -ne 0) { exit $LastExitCode } @@ -52,7 +52,7 @@ build_script: -D MSGPACK_BUILD_EXAMPLES=ON ` -D MSGPACK_BUILD_TESTS=ON ` -D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" ` - -D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.12\prefix" ` + -D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.13\prefix" ` -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" ` -D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" ` .. @@ -62,5 +62,5 @@ build_script: if ($LastExitCode -ne 0) { exit $LastExitCode } test_script: -- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.12\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir% +- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir% - ctest -VV -C Release