diff options
| -rw-r--r-- | .github/workflows/push.yml | 11 | ||||
| -rw-r--r-- | dist/msys2-mingw/run.sh | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 37eea6b76..e250ff1d2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -57,16 +57,19 @@ jobs: MINGW_INSTALLS: ${{ matrix.task.installs }} TARGET: ${{ matrix.task.pkg }} steps: - - uses: numworks/setup-msys2@v1 + - uses: eine/setup-msys2@v0 with: msystem: MSYS - - run: msys2do pacman -Syu --noconfirm + update: true - uses: actions/checkout@v1 - name: Build and (hopefully) install package + shell: msys2 {0} run: | - msys2do ./dist/msys2-mingw/run.sh -b + ./dist/msys2-mingw/run.sh -b - name: Test package - run: msys2do ./dist/msys2-mingw/run.sh -t + shell: msys2 {0} + run: | + ./dist/msys2-mingw/run.sh -t env: MSYSTEM: ${{ matrix.task.installs }} diff --git a/dist/msys2-mingw/run.sh b/dist/msys2-mingw/run.sh index 42af62b19..40d25004e 100644 --- a/dist/msys2-mingw/run.sh +++ b/dist/msys2-mingw/run.sh @@ -99,7 +99,7 @@ build () { ls -la gstart 'Install package' - pacman --noconfirm -U "mingw-w64-${TARBALL_ARCH}-ghdl-${TARGET}-ci"-*-any.pkg.tar.xz + pacman --noconfirm -U "mingw-w64-${TARBALL_ARCH}-ghdl-${TARGET}-ci"-*-any.pkg.tar.zst gend } |