From: Viktor Szakats Date: Sun, 13 Apr 2025 10:01:00 +0000 (+0200) Subject: GHA/windows: add support for built-in OpenSSH-Windows X-Git-Tag: curl-8_14_0~311 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f81647db0ba77ba1f7d399ea72d023dad4a945b9;p=thirdparty%2Fcurl.git GHA/windows: add support for built-in OpenSSH-Windows On the windows-2022 runner it installs these client/server versions: ``` ssh client found /c/Windows/System32/OpenSSH/ssh.exe is OpenSSH-Windows 9.5.0 ssh server found /c/Windows/System32/OpenSSH/sshd.exe is OpenSSH-Windows 8.1.0 ``` Not currently enabled. Slight downside (when enabled) that Windows needs over 1 minute to install these two tiny programs. Closes #17046 --- diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 36f7c5a4fc..76c5eb19d5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -933,6 +933,10 @@ jobs: run: | if [ '${{ matrix.openssh }}' = '' ]; then # MSYS2 openssh /usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh + elif [ '${{ matrix.openssh }}' = 'OpenSSH-Windows-builtin' ]; then + # https://learn.microsoft.com/windows-server/administration/openssh/openssh_install_firstuse + pwsh -Command 'Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0' + pwsh -Command 'Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0' else # OpenSSH-Windows cd /d || exit 1 curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 \