From 7010f450e89893ea2ae0afee297a261642aa9c57 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Aug 2025 14:36:32 +0200 Subject: [PATCH] cleanups --- .github/workflows/windows.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c37848d7d0..82bb33a000 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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