@@ -176,9 +176,9 @@ jobs:
176
176
meta :
177
177
runs-on : ubuntu-latest
178
178
outputs :
179
+ matrix_supportedSplunk : ${{ steps.matrix.outputs.supportedSplunk }}
179
180
matrix_latestSplunk : ${{ steps.matrix.outputs.latestSplunk }}
180
181
matrix_supportedSC4S : ${{ steps.matrix.outputs.supportedSC4S }}
181
- matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
182
182
matrix_supportedModinputFunctionalVendors : ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
183
183
matrix_supportedUIVendors : ${{ steps.matrix.outputs.supportedUIVendors }}
184
184
permissions :
@@ -190,13 +190,7 @@ jobs:
190
190
submodules : false
191
191
persist-credentials : false
192
192
- id : matrix
193
- uses : splunk/addonfactory-test-matrix-action@v2.0.2
194
- - name : Combined Splunk and SC4S Versions
195
- id : combined_Splunkmatrix
196
- run : |
197
- splunk='{"version":"unreleased-python3_9-f8b1a92a256b", "build":"7027496d63d8", "islatest":false, "isoldest":false}'
198
- combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]')
199
- echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT"
193
+ uses : splunk/addonfactory-test-matrix-action@v2.1
200
194
201
195
fossa-scan :
202
196
runs-on : ubuntu-latest
@@ -922,7 +916,7 @@ jobs:
922
916
strategy :
923
917
fail-fast : false
924
918
matrix :
925
- splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
919
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
926
920
sc4s : ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
927
921
928
922
container :
@@ -1155,7 +1149,7 @@ jobs:
1155
1149
strategy :
1156
1150
fail-fast : false
1157
1151
matrix :
1158
- splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1152
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1159
1153
sc4s : ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
1160
1154
1161
1155
container :
@@ -1366,7 +1360,7 @@ jobs:
1366
1360
strategy :
1367
1361
fail-fast : false
1368
1362
matrix :
1369
- splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1363
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1370
1364
browser : [ "chrome" ]
1371
1365
vendor-version : ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }}
1372
1366
marker : ${{ fromJson(inputs.ui_marker) }}
@@ -1599,7 +1593,7 @@ jobs:
1599
1593
strategy :
1600
1594
fail-fast : false
1601
1595
matrix :
1602
- splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1596
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1603
1597
modinput-type : [ "modinput_functional" ]
1604
1598
vendor-version : ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
1605
1599
marker : ${{ fromJson(inputs.marker) }}
@@ -1830,7 +1824,7 @@ jobs:
1830
1824
strategy :
1831
1825
fail-fast : false
1832
1826
matrix :
1833
- splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1827
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1834
1828
os : [ "ubuntu:14.04", "ubuntu:16.04","ubuntu:18.04","ubuntu:22.04", "centos:7", "redhat:8.0", "redhat:8.2", "redhat:8.3", "redhat:8.4", "redhat:8.5" ]
1835
1829
container :
1836
1830
image : ghcr.io/splunk/workflow-engine-base:4.1.0
0 commit comments