split linux package out to simplify matrix

develop
Myk Taylor 2023-07-31 00:05:47 -07:00
parent b6ececed2d
commit 1fad6d76f1
No known key found for this signature in database
1 changed files with 26 additions and 26 deletions

@ -4,35 +4,23 @@ on: [push, pull_request]
jobs: jobs:
build-linux: build-linux:
name: Linux ${{ matrix.type }}, GCC ${{ matrix.gcc }} name: Linux gcc-${{ matrix.gcc }}
uses: ./.github/workflows/build-linux.yml uses: ./.github/workflows/build-linux.yml
with: with:
artifact-name: ${{ matrix.artifact-name || format('{0}-gcc-{1}', matrix.type, matrix.gcc) }} artifact-name: test-gcc-${{ matrix.gcc }}
append-date-and-hash: ${{ matrix.append-date-and-hash && true || false }} cache-id: test
cache-id: ${{ matrix.type }} stonesense: ${{ matrix.plugins == 'all' }}
stonesense: ${{ matrix.stonesense }} extras: ${{ matrix.plugins == 'all' }}
docs: ${{ matrix.type == 'release' }}
extras: ${{ matrix.extras }}
gcc-ver: ${{ matrix.gcc }} gcc-ver: ${{ matrix.gcc }}
secrets: inherit secrets: inherit
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- type: release - gcc: 10
gcc: "10" plugins: "default"
artifact-name: dfhack-linux64 - gcc: 12
append-date-and-hash: true plugins: "all"
stonesense: true
extras: false
- type: test
gcc: "10"
stonesense: false
extras: false
- type: test
gcc: "12"
stonesense: true
extras: true
test-linux: test-linux:
name: Test (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins) name: Test (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins)
@ -41,11 +29,11 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
gcc: [10]
plugins: [default]
include: include:
- gcc: 12 - gcc: 10
plugins: all plugins: "default"
- gcc: 12
plugins: "all"
steps: steps:
- name: Download artifact - name: Download artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
@ -83,6 +71,18 @@ jobs:
# run: | # run: |
# rm -rf "$DF_FOLDER" # rm -rf "$DF_FOLDER"
package-linux:
name: Linux package
uses: ./.github/workflows/build-linux.yml
with:
artifact-name: dfhack-linux64
append-date-and-hash: true
cache-id: release
stonesense: true
docs: true
gcc-ver: "10"
secrets: inherit
package-win64: package-win64:
name: Win64 package (native) name: Win64 package (native)
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
@ -140,7 +140,7 @@ jobs:
secrets: inherit secrets: inherit
lint: lint:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
steps: steps:
- name: Install Lua - name: Install Lua
run: | run: |