From 7184817e6f14e6126ccbdcaf9da7c6ffbc7afc45 Mon Sep 17 00:00:00 2001 From: umarcor Date: Wed, 1 Dec 2021 18:45:36 +0100 Subject: [PATCH] ci/win: use option 'pacboy' of setup-msys2 --- .github/workflows/Test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 54c35f5..51c0d76 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -130,10 +130,10 @@ jobs: fail-fast: false matrix: include: - - { icon: '⬛', sys: mingw32, env: i686 } - - { icon: '🟦', sys: mingw64, env: x86_64 } - - { icon: '🟨', sys: ucrt64, env: ucrt-x86_64 } # Experimental! - - { icon: '🟧', sys: clang64, env: clang-x86_64 } # Experimental! + - { icon: '⬛', sys: mingw32 } + - { icon: '🟦', sys: mingw64 } + - { icon: '🟨', sys: ucrt64 } # Experimental! + - { icon: '🟧', sys: clang64 } # Experimental! name: '🚧${{ matrix.icon }} ${{ matrix.sys }} | makepkg' defaults: run: @@ -160,7 +160,7 @@ jobs: git base-devel tree - mingw-w64-${{ matrix.env }}-toolchain + pacboy: toolchain:p - name: '🚧 Build package' run: | @@ -171,7 +171,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ matrix.sys }}-openFPGALoader - path: scripts/msys2/*${{ matrix.env }}*.zst + path: scripts/msys2/*.zst - name: '🔍 Show package content' run: | @@ -188,10 +188,10 @@ jobs: fail-fast: false matrix: include: - - { icon: '⬛', sys: mingw32, env: i686 } - - { icon: '🟦', sys: mingw64, env: x86_64 } - - { icon: '🟨', sys: ucrt64, env: ucrt-x86_64 } # Experimental! - - { icon: '🟧', sys: clang64, env: clang-x86_64 } # Experimental! + - { icon: '⬛', sys: mingw32 } + - { icon: '🟦', sys: mingw64 } + - { icon: '🟨', sys: ucrt64 } # Experimental! + - { icon: '🟧', sys: clang64 } # Experimental! name: '🚦${{ matrix.icon }} ${{ matrix.sys }} | test' defaults: run: