From b168717e9164f788c6f588d8b034980c4422e2dc Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 15 Oct 2022 22:02:34 +0200 Subject: [PATCH] Update zlib to 1.2.13 1.2.12 is no longer provided by upstream anymore, which fails Windows CI --- .github/workflows/create-release-artifacts.yaml | 6 +++--- .github/workflows/testing.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-release-artifacts.yaml b/.github/workflows/create-release-artifacts.yaml index e8d55561..cc8e5b15 100644 --- a/.github/workflows/create-release-artifacts.yaml +++ b/.github/workflows/create-release-artifacts.yaml @@ -28,9 +28,9 @@ jobs: - name: Get zlib, libpng and bison run: | # TODO: use an array; remember to update the versions being downloaded, *and* the paths being extracted! (`Move-Item`) $wc = New-Object System.Net.WebClient - $wc.DownloadFile('https://www.zlib.net/zlib1212.zip', 'zlib.zip') + $wc.DownloadFile('https://www.zlib.net/zlib1213.zip', 'zlib.zip') $hash = (Get-FileHash "zlib.zip" -Algorithm SHA256).Hash - if ($hash -ne '173e89893dcb8b4a150d7731cd72f0602f1d6b45e60e2a54efdf7f3fc3325fd7') { + if ($hash -ne 'd233fca7cf68db4c16dc5287af61f3cd01ab62495224c66639ca3da537701e42') { Write-Host "zlib SHA256 mismatch! ($hash)" exit 1 } @@ -48,7 +48,7 @@ jobs: Expand-Archive -DestinationPath . "zlib.zip" Expand-Archive -DestinationPath . "libpng.zip" Expand-Archive -DestinationPath install_dir "winflexbison.zip" - Move-Item zlib-1.2.12 zlib + Move-Item zlib-1.2.13 zlib Move-Item lpng1637 libpng - uses: actions/cache@v3 id: cache diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index cffc002e..62df2c6f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -79,9 +79,9 @@ jobs: - name: Get zlib, libpng and bison run: | # TODO: use an array; remember to update the versions being downloaded, *and* the paths being extracted! (`Move-Item`) $wc = New-Object System.Net.WebClient - $wc.DownloadFile('https://www.zlib.net/zlib1212.zip', 'zlib.zip') + $wc.DownloadFile('https://www.zlib.net/zlib1213.zip', 'zlib.zip') $hash = (Get-FileHash "zlib.zip" -Algorithm SHA256).Hash - if ($hash -ne '173e89893dcb8b4a150d7731cd72f0602f1d6b45e60e2a54efdf7f3fc3325fd7') { + if ($hash -ne 'd233fca7cf68db4c16dc5287af61f3cd01ab62495224c66639ca3da537701e42') { Write-Host "zlib SHA256 mismatch! ($hash)" exit 1 } @@ -99,7 +99,7 @@ jobs: Expand-Archive -DestinationPath . "zlib.zip" Expand-Archive -DestinationPath . "libpng.zip" Expand-Archive -DestinationPath install_dir "winflexbison.zip" - Move-Item zlib-1.2.12 zlib + Move-Item zlib-1.2.13 zlib Move-Item lpng1637 libpng - uses: actions/cache@v3 id: cache