romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-06 17:37:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

cleanups

Browse source
This commit is contained in:
Viktor Szakats 2025-08-29 14:36:32 +02:00
parent 46677cfd96
commit 7010f450e8
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/windows.yml vendored
View file

@ -2,8 +2,6 @@
#
# SPDX-License-Identifier: curl
# test
name: 'Windows'
'on':
@ -431,7 +429,7 @@ jobs:
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
timeout-minutes: 5
run: |
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh make
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
perl --version | tee "$GITHUB_WORKSPACE"/perlversion
@ -449,10 +447,8 @@ jobs:
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
timeout-minutes: 5
run: &perl-win32-pkgs-install |
echo '-------------------'
perl --version
if [ -d /c/perl-win32-pkgs ]; then
echo "!!! perl-win32-pkgs directory detected"
pushd /c/perl-win32-pkgs
pushd Win32-Process-0.17
install -D blib/arch/auto/Win32/Process/Process.dll /usr/lib/perl5/site_perl/auto/Win32/Process/Process.dll
@ -465,12 +461,8 @@ jobs:
install -D blib/lib/Win32/Process/processes.pl /usr/lib/perl5/site_perl/Win32/Process/processes.pl
popd
popd
else
echo "perl-win32-pkgs directory not detected"
fi
echo '-------------------'
perl tests/wintest.pl
echo '-------------------'
- name: 'run tests'
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@ -667,7 +659,6 @@ jobs:
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
timeout-minutes: 5
run: |
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed make
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
perl --version | tee "$GITHUB_WORKSPACE"/perlversion
@ -1049,16 +1040,14 @@ jobs:
timeout-minutes: 5
run: |
if [ -z "${MATRIX_OPENSSH}" ]; then # MSYS2 openssh
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh make
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh
elif [ "${MATRIX_OPENSSH}" = 'OpenSSH-Windows-builtin' ]; then
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed make
# https://learn.microsoft.com/windows-server/administration/openssh/openssh_install_firstuse
if [ "${MATRIX_IMAGE}" != 'windows-2025' ]; then
pwsh -Command 'Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0'
pwsh -Command 'Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0'
fi
else # OpenSSH-Windows
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed make
cd /c # no D: drive on windows-11-arm runners
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 --retry-connrefused \
--location "https://github.com/PowerShell/Win32-OpenSSH/releases/download/${OPENSSH_WINDOWS_VERSION}/OpenSSH-Win64.zip" --output bin.zip