[openssh-commits] [openssh] 01/04: Backport test environment changes for Cygwin.
git+noreply at mindrot.org
git+noreply at mindrot.org
Wed May 21 16:11:56 AEST 2025
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch V_10_0
in repository openssh.
commit c99e3fe71aab10f64324e2e783c34a8a912c4e5d
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Wed May 21 15:03:09 2025 +1000
Backport test environment changes for Cygwin.
---
.github/setup_ci.sh | 13 +++++++++++--
.github/workflows/c-cpp.yml | 5 +++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index f6c4a5c84..b381adebe 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -10,9 +10,17 @@ case "$host" in
*cygwin)
PACKAGER=setup
echo Setting CYGWIN system environment variable.
- setx CYGWIN "binmode"
+ setx CYGWIN "winsymlinks:native"
echo Removing extended ACLs so umask works as expected.
+ set -x
setfacl -b . regress
+ icacls regress /c /t /q /Inheritance:d
+ icacls regress /c /t /q /Grant ${USERNAME}:F
+ icacls regress /c /t /q /Remove:g "Authenticated Users" \
+ BUILTIN\\Administrators BUILTIN Everyone System Users
+ takeown /F regress
+ icacls regress
+ set +x
PACKAGES="$PACKAGES,autoconf,automake,cygwin-devel,gcc-core"
PACKAGES="$PACKAGES,make,openssl,libssl-devel,zlib-devel"
;;
@@ -184,7 +192,8 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
fi
;;
setup)
- if /cygdrive/c/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 424c193fb..903ed64b5 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -115,11 +115,16 @@ 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
+ env:
+ CYGWIN: "winsymlinks:native"
- 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.
More information about the openssh-commits
mailing list