Pass Cygwin setup location to CI setup.

(instead of hard coding it, wrongly).

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index e4c7b041aa5030b8be39e0210912f04ed9d1e1f2..81cdc1368fdd28d33afe0372371b639a0663d5f6 100755 (executable)
--- 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 b5b6de7fa3fb7e4e4c437a34ffeac69135bd58be..0807ae8516fce78f3c2860654a9d95c48efad67b 100644 (file)
--- 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@master
     - uses: actions/checkout@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