[openssh-commits] [openssh] 02/07: Pass Cygwin setup location to CI setup.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit d5cbac2364b03e55b733a2422a07e78e16d2a118
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Sat May 10 07:59:44 2025 +1000

    Pass Cygwin setup location to CI setup.
    
    (instead of hard coding it, wrongly).
---
 .github/setup_ci.sh         | 3 ++-
 .github/workflows/c-cpp.yml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index e4c7b041a..81cdc1368 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -192,7 +192,8 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
 	fi
 	;;
     setup)
-	if /cygdrive/d/cygwin/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
+	setup="/cygdrive/$(echo "${CYGWIN_SETUP}" | tr -d : | tr '\' '/')"
+	if "${setup}" -q -P `echo "$PACKAGES" | tr ' ' ,`; then
 		PACKAGES=""
 	fi
 	;;
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b5b6de7fa..0807ae851 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -121,11 +121,14 @@ jobs:
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: git config --global core.autocrlf input
     - name: install cygwin
+      id: cygwin_install
       if: ${{ startsWith(matrix.target, 'windows') }}
       uses: cygwin/cygwin-install-action at master
     - uses: actions/checkout at main
     - name: setup CI system
       run: sh ./.github/setup_ci.sh ${{ matrix.config }}
+      env:
+        CYGWIN_SETUP: ${{ steps.cygwin_install.outputs.setup }}
     - name: autoreconf
       run: sh -c autoreconf
     - name: configure

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.