diff options
| author | eine <eine@users.noreply.github.com> | 2020-11-29 02:31:50 +0100 |
|---|---|---|
| committer | eine <eine@users.noreply.github.com> | 2020-11-29 04:00:47 +0100 |
| commit | d4138d0190c959a41ada6e490ee37352b0244cf2 (patch) | |
| tree | fb61f4106e0a17aae1bed99a001d467a10c89c1d /.github | |
| parent | 07c4518f6724417b0c413aecf9f2ab3ba9717282 (diff) | |
| download | ghdl-d4138d0190c959a41ada6e490ee37352b0244cf2.tar.gz ghdl-d4138d0190c959a41ada6e490ee37352b0244cf2.tar.bz2 ghdl-d4138d0190c959a41ada6e490ee37352b0244cf2.zip | |
ci: matrix cleanup
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/push.yml | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c3de51aee..691cb2e3c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,23 +48,23 @@ jobs: fail-fast: false max-parallel: 4 matrix: - backend: [ - { os: 18, b: mcode }, - { os: 20, b: mcode }, - { os: 18, b: llvm-5.0 }, - { os: 20, b: llvm-10 }, - { os: 18, b: gcc-8.3.0 }, - { os: 20, b: gcc-9.3.0 } + include: [ + { os: 18, backend: mcode }, + { os: 20, backend: mcode }, + { os: 18, backend: llvm-5.0 }, + { os: 20, backend: llvm-10 }, + { os: 18, backend: gcc-8.3.0 }, + { os: 20, backend: gcc-9.3.0 } ] - runs-on: ubuntu-${{ matrix.backend.os }}.04 + runs-on: ubuntu-${{ matrix.os }}.04 steps: - uses: actions/checkout@v2 - name: Build and test GHDL in containers run: | - TASK=ubuntu${{ matrix.backend.os }}+${{ matrix.backend.b }}${{ matrix.backend.v }} ./dist/ci-run.sh -c - mv ghdl-*-ubuntu${{ matrix.backend.os }}-*.tgz ghdl-gha-ubuntu-${{ matrix.backend.os }}.04-$(echo ${{ matrix.backend.b }} | sed 's#-.*##g').tgz + TASK=ubuntu${{ matrix.os }}+${{ matrix.backend }} ./dist/ci-run.sh -c + mv ghdl-*-ubuntu${{ matrix.os }}-*.tgz ghdl-gha-ubuntu-${{ matrix.os }}.04-$(echo ${{ matrix.backend }} | sed 's#-.*##g').tgz - uses: actions/upload-artifact@v2 with: @@ -103,15 +103,15 @@ jobs: fail-fast: false max-parallel: 2 matrix: - task: [ + include: [ {installs: "MINGW32", pkg: "mcode"}, #{installs: "MINGW32", pkg: "llvm"}, ! Not yet functional #{installs: "MINGW64", pkg: "mcode"}, ! mcode is not yet supported on win64 {installs: "MINGW64", pkg: "llvm"}, ] env: - MINGW_INSTALLS: ${{ matrix.task.installs }} - TARGET: ${{ matrix.task.pkg }} + MINGW_INSTALLS: ${{ matrix.installs }} + TARGET: ${{ matrix.pkg }} defaults: run: shell: msys2 {0} @@ -129,20 +129,18 @@ jobs: - uses: actions/checkout@v2 - name: Build and (hopefully) install package - run: | - ./dist/msys2-mingw/run.sh -b - cp ./dist/msys2-mingw/${{ matrix.task.pkg }}/mingw-*ghdl*.pkg.tar.zst ghdl-gha-${{ matrix.installs }}-${{ matrix.task }}.zst + run: ./dist/msys2-mingw/run.sh -b - uses: actions/upload-artifact@v2 with: - name: ${{ matrix.task.installs }}-${{ matrix.task.pkg }}-builddir + name: ${{ matrix.installs }}-${{ matrix.pkg }}-builddir path: | - ./dist/msys2-mingw/${{ matrix.task.pkg }}/src/ - ./dist/msys2-mingw/${{ matrix.task.pkg }}/pkg/ + ./dist/msys2-mingw/${{ matrix.pkg }}/src/ + ./dist/msys2-mingw/${{ matrix.pkg }}/pkg/ - uses: actions/upload-artifact@v2 with: - path: ./dist/msys2-mingw/${{ matrix.task.pkg }}/mingw-*ghdl*.pkg.tar.zst + path: ./dist/msys2-mingw/${{ matrix.pkg }}/mingw-*ghdl*.pkg.tar.zst - name: Test package run: | @@ -150,7 +148,7 @@ jobs: env | grep MINGW GHDL=ghdl ./testsuite/testsuite.sh env: - MSYSTEM: ${{ matrix.task.installs }} + MSYSTEM: ${{ matrix.installs }} # # NIGHTLY |