saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix condition check

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-12-05 21:59:44 -07:00 • committed by Daniel Wozniak
parent 409d5b93cb
commit 3d41bdccc6
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/test-action.yml vendored
View file

@ -67,7 +67,7 @@ jobs:
test-linux:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }} ${{ matrix.fips && '--fips ' || '' }}
if: ${{ fromJSON(inputs.matrix)['linux'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
container:
@ -317,7 +317,7 @@ jobs:
runs-on: ${{ matrix.runner }}
# Full test runs. Each chunk should never take more than 2 hours.
# Partial test runs(no chunk parallelization), 6 Hours
if: ${{ fromJSON(inputs.matrix)['macos'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['macos']) != '[]' }}
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
strategy:
fail-fast: false
@ -548,7 +548,7 @@ jobs:
test-windows:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}
if: ${{ fromJSON(inputs.matrix)['windows'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
runs-on: ${{ matrix.slug }}
# Full test runs. Each chunk should never take more than 2 hours.
# Partial test runs(no chunk parallelization), 6 Hours
@ -786,6 +786,7 @@ jobs:
report:
name: Test Reports
runs-on: ubuntu-22.04
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
needs:
- test-linux
- test-macos

8
.github/workflows/test-packages-action.yml vendored
View file

@ -65,7 +65,7 @@ jobs:
# container:
# image: ${{ matrix.container }}
# options: --privileged
if: ${{ fromJSON(inputs.matrix)['linux'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
strategy:
fail-fast: false
@ -193,7 +193,7 @@ jobs:
test-macos:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }}
runs-on: ${{ matrix.runner }}
if: ${{ fromJSON(inputs.matrix)['macos'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['macos']) != '[]' }}
timeout-minutes: 150 # 2 & 1/2 Hours - More than this and something is wrong (MacOS needs a little more time)
strategy:
fail-fast: false
@ -312,7 +312,7 @@ jobs:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }}
runs-on: ${{ matrix.distro-slug }}
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
if: ${{ fromJSON(inputs.matrix)['windows'] != '[ ]' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
strategy:
fail-fast: false
matrix:
@ -454,7 +454,7 @@ jobs:
report:
name: Report
runs-on: ubuntu-22.04
if: always()
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
needs:
- test-linux
- test-macos