From b06c12b7248592cf001e621d7cd8dc78a827212b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 5 Mar 2025 14:55:30 +0100 Subject: [PATCH] GHA/windows: bump msys2 action, downgrade runtime for mingw tests Bump msys2/setup-msys2 from 2.26.0 to 2.27.0. It brings the perf regression experienced earlier with GfW and the pre-installed MSYS2 on the GHA runner. Apply the runtime downgrade trick as a workaround. Fixes #16440 Fixes #16547 Closes #16574 --- .github/workflows/windows.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4f9335c594..bfa0248728 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -192,7 +192,7 @@ jobs: - run: git config --global core.autocrlf input shell: pwsh - - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # v2 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2 if: ${{ matrix.sys == 'msys' }} with: msystem: ${{ matrix.sys }} @@ -209,7 +209,7 @@ jobs: libpsl-devel libssh2-devel - - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # v2 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2 if: ${{ matrix.sys != 'msys' }} with: msystem: ${{ matrix.sys }} @@ -223,6 +223,15 @@ jobs: mingw-w64-${{ matrix.env }}-libpsl mingw-w64-${{ matrix.env }}-c-ares + - name: 'downgrade msys2-runtime' + if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' && matrix.sys != 'msys' }} + timeout-minutes: 2 + # Downgrade to a known good MSYS2 runtime version to avoid the performance regression + # causing runtests.pl to run at 2-3x reduced speed. + run: | + /usr/bin/sed -i 's/^CheckSpace/#CheckSpace/' /etc/pacman.conf + exec /usr/bin/pacman --noconfirm --noprogressbar --upgrade https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.5.4-8-x86_64.pkg.tar.zst + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: persist-credentials: false -- 2.47.3