mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Fix empty martix
This commit is contained in:
parent
971f3f188d
commit
709a09a60a
3 changed files with 11 additions and 6 deletions
3
.github/workflows/test-action.yml
vendored
3
.github/workflows/test-action.yml
vendored
|
@ -791,8 +791,7 @@ jobs:
|
|||
- test-windows
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include: ${{ fromJSON(inputs.matrix)['linux'] }}
|
||||
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
|
||||
env:
|
||||
PIP_INDEX_URL: https://pypi.org/simple
|
||||
|
||||
|
|
3
.github/workflows/test-packages-action.yml
vendored
3
.github/workflows/test-packages-action.yml
vendored
|
@ -450,8 +450,7 @@ jobs:
|
|||
- test-macos
|
||||
- test-windows
|
||||
strategy:
|
||||
matrix:
|
||||
include: ${{ fromJSON(inputs.matrix)['linux'] }}
|
||||
matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
|
||||
|
||||
steps:
|
||||
- name: Checkout Source Code
|
||||
|
|
11
tools/ci.py
11
tools/ci.py
|
@ -1707,8 +1707,15 @@ def workflow_config(
|
|||
ctx.info(f"{pprint.pformat(test_matrix)}")
|
||||
ctx.info(f"{'==== end test matrix ====':^80s}")
|
||||
|
||||
config["pkg-test-matrix"] = pkg_test_matrix # type: ignore
|
||||
config["test-matrix"] = test_matrix # type: ignore
|
||||
config["pkg-test-matrix"] = {}
|
||||
config["test-matrix"] = {}
|
||||
for platform in platforms:
|
||||
config["pkg-test-matrix"][platform] = {} # type: ignore
|
||||
if pkg_test_matrix.get(platform, {}):
|
||||
config["pkg-test-matrix"][platform]["include"] = pkg_test_matrix[platform] # type: ignore
|
||||
config["test-matrix"][platform] = {} # type: ignore
|
||||
if test_matrix.get(platform, {}):
|
||||
config["test-matrix"][platform]["include"] = test_matrix[platform] # type: ignore
|
||||
|
||||
ctx.info("Jobs selected are")
|
||||
for x, y in jobs.items():
|
||||
|
|
Loading…
Add table
Reference in a new issue