ci/win: merge 'win' and 'msys'

This commit is contained in:
umarcor 2020-12-01 04:20:52 +01:00
parent eca41e411e
commit ed27dbf608
1 changed files with 40 additions and 43 deletions

View File

@ -39,10 +39,38 @@ jobs:
win: win:
runs-on: windows-latest runs-on: windows-latest
name: '🧊 Windows' strategy:
fail-fast: false
matrix:
include: [
{
label: '🧊 Windows',
msystem: MINGW64,
arch: x86_64,
release: false,
shell: mingw64,
},
{
label: '🟪 MSYS2',
msystem: MINGW64,
arch: x86_64,
release: true,
shell: msys2,
},
{
label: '🟪 MSYS2',
msystem: MINGW32,
arch: i686,
release: true,
shell: msys2,
}
]
name: ${{ matrix.label }} · ${{ matrix.msystem}}
defaults: defaults:
run: run:
shell: mingw64 {0} shell: ${{ matrix.shell }} {0}
env:
MINGW_INSTALLS: ${{ matrix.msystem }}
steps: steps:
- name: Setup - name: Setup
@ -55,14 +83,16 @@ jobs:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
release: false release: ${{ matrix.release }}
msystem: MINGW64 msystem: ${{ matrix.msystem }}
install: > install: >
git
base-devel base-devel
mingw-w64-x86_64-toolchain mingw-w64-${{ matrix.arch }}-toolchain
update: true update: true
- name: Build, install and check - name: 🧊 Build, install and check
if: matrix.shell == 'mingw64'
run: | run: |
wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; } wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
wrap ./autoconf.sh wrap ./autoconf.sh
@ -71,47 +101,14 @@ jobs:
which iverilog which iverilog
wrap make check wrap make check
- name: Test - name: 🟪 Build and check
run: ./.github/test.sh if: matrix.shell == 'msys2'
msys2:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
include: [
{ msystem: MINGW64, arch: x86_64 },
{ msystem: MINGW32, arch: i686 }
]
name: '🟪 MSYS2 · ${{ matrix.msystem }}'
defaults:
run:
shell: msys2 {0}
env:
MINGW_INSTALLS: ${{ matrix.msystem }}
steps:
- run: git config --global core.autocrlf input
shell: bash
- uses: actions/checkout@v2
- uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.msystem }}
install: >
git
base-devel
mingw-w64-${{ matrix.arch }}-toolchain
update: true
- name: Build
run: | run: |
cd msys2 cd msys2
makepkg-mingw --noconfirm --noprogressbar -sCLf makepkg-mingw --noconfirm --noprogressbar -sCLf
- name: Install - name: 🟪 Install
if: matrix.shell == 'msys2'
run: pacman -U --noconfirm msys2/*.zst run: pacman -U --noconfirm msys2/*.zst
- name: Test - name: Test