Re-use include for matrix

This commit is contained in:
Daniel A. Wozniak 2024-12-06 14:12:35 -07:00 committed by Daniel Wozniak
parent efe0173aef
commit 8a75364276

View file

@ -66,7 +66,7 @@ env:
jobs:
test-linux:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }} ${{ matrix.fips && '--fips ' || '' }}
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}${{ matrix.fips && '--fips ' || '' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
@ -77,7 +77,8 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
@ -317,7 +318,8 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix: ${{ fromJSON(inputs.matrix)['macos'] }}
matrix:
include: ${{ fromJSON(inputs.matrix)['macos'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
@ -550,7 +552,8 @@ jobs:
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
matrix: ${{ fromJSON(inputs.matrix)['windows'] }}
matrix:
include: ${{ fromJSON(inputs.matrix)['windows'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
steps: