From 5e60b53a3b10d170652d084be10e24378850ef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sat, 20 Jan 2024 23:32:51 +0100 Subject: [PATCH] Hopefully fix msys2 workflows Apparently updating msys2 causes it to exit completely, great. --- .github/build.sh | 2 +- .github/workflows/build.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/build.sh b/.github/build.sh index 210ea406d..9e410847f 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -70,7 +70,7 @@ if [[ -z ${BSH_NO_PACKAGES-} ]]; then ;; windows) if [[ $BSH_BUILD_PLATFORM-$BSH_HOST_LIBC == windows-mingw ]]; then - pacman -Syu --noconfirm --needed mingw-w64-ucrt-x86_64-gcc + pacman -S --noconfirm --needed mingw-w64-ucrt-x86_64-gcc if [[ $BSH_STATIC_DYNAMIC == static ]]; then pacman -S --noconfirm --needed mingw-w64-ucrt-x86_64-{cmake,7zip} patch else diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8dbfd5cc8..8eb7f0a31 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,6 +59,8 @@ jobs: - uses: actions/checkout@v3 - if: matrix.force_msys2_bash == 'yes' run: bash -c './.github/force-msys2-bash.sh' + - if: matrix.force_msys2_bash == 'yes' + run: bash -c 'pacman -Syu --noconfirm' - uses: actions/setup-python@v4 with: python-version: '3.10'