Commit 3bb329c for zlib
commit 3bb329ccd56d7d0473e278455ecd5c931cc1b83a
Author: Mark Adler <git@madler.net>
Date: Mon Nov 2 20:46:43 2026 -0800
Repair cygwin workflow.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 288e47c..9c111d1 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -114,7 +114,12 @@ jobs:
- name: Install packages (Windows)
if: runner.os == 'Windows'
run: |
- choco install --no-progress nsis
+ foreach ($try in 1..3) {
+ choco install --no-progress nsis
+ if (Test-Path "${env:ProgramFiles(x86)}\NSIS\makensis.exe") { exit 0 }
+ Start-Sleep -Seconds 60
+ }
+ exit 1
- name: Install packages (Linux)
if: runner.os == 'Linux'
@@ -142,8 +147,9 @@ jobs:
with:
name: ${{ matrix.name }} (cmake)
path: |
- ../build/CMakeFiles/CMakeOutput.log
- ../build/CMakeFiles/CMakeError.log
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeConfigureLog.yaml
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeOutput.log
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeError.log
retention-days: 7
ci-cmake-minimum:
@@ -185,6 +191,7 @@ jobs:
with:
name: Ubuntu GCC minimum CMake (cmake)
path: |
- ../build/CMakeFiles/CMakeOutput.log
- ../build/CMakeFiles/CMakeError.log
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeConfigureLog.yaml
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeOutput.log
+ ${{ runner.workspace }}/build/CMakeFiles/CMakeError.log
retention-days: 7
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index b9162b2..d65c346 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -142,5 +142,5 @@ jobs:
with:
name: ${{ matrix.name }} (configure)
path: |
- ${{ matrix.build-dir || '.' }}/configure.log
+ ${{ matrix.build-dir && format('{0}/build', runner.workspace) || github.workspace }}/configure.log
retention-days: 7
diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml
index d58e488..fdfdafc 100644
--- a/.github/workflows/msys-cygwin.yml
+++ b/.github/workflows/msys-cygwin.yml
@@ -72,6 +72,7 @@ jobs:
- name: Setup cygwin
uses: cygwin/cygwin-install-action@master
with:
+ install-dir: C:\cygwin
packages: >-
cmake
cygwin-devel