@@ -261,6 +261,7 @@ jobs:
261
261
container_base : ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
262
262
matrix_supportedSplunk : ${{ steps.matrix.outputs.supportedSplunk }}
263
263
matrix_latestSplunk : ${{ steps.matrix.outputs.latestSplunk }}
264
+ matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
264
265
matrix_supportedSC4S : ${{ steps.matrix.outputs.supportedSC4S }}
265
266
matrix_supportedModinputFunctionalVendors : ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
266
267
matrix_supportedUIVendors : ${{ steps.matrix.outputs.supportedUIVendors }}
@@ -307,6 +308,12 @@ jobs:
307
308
run : |
308
309
echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT"
309
310
echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}" >> "$GITHUB_OUTPUT"
311
+ - name : combined_Splunkmatrix
312
+ id : combined_Splunkmatrix
313
+ run : |
314
+ combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]')
315
+ echo "combinedSplunkversions=$(echo "$combinedSplunkversions"| jq -c .)" >> "$GITHUB_OUTPUT"
316
+
310
317
311
318
fossa-scan :
312
319
runs-on : ubuntu-latest
@@ -872,7 +879,7 @@ jobs:
872
879
name : package-splunkbase
873
880
path : build/package/
874
881
- name : Scan
875
- uses : splunk/appinspect-cli-action@v2.4
882
+ uses : splunk/appinspect-cli-action@v2.5
876
883
with :
877
884
app_path : build/package/
878
885
included_tags : ${{ matrix.tags }}
@@ -1742,19 +1749,13 @@ jobs:
1742
1749
- meta
1743
1750
- setup-workflow
1744
1751
runs-on : ubuntu-latest
1745
- continue-on-error : ${{ matrix.python39 }}
1746
1752
strategy :
1747
1753
fail-fast : false
1748
1754
matrix :
1749
- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1755
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1750
1756
modinput-type : [ "modinput_functional" ]
1751
1757
vendor-version : ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
1752
1758
marker : ${{ fromJson(inputs.marker) }}
1753
- python39 : [false]
1754
- include :
1755
- - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1756
- modinput-type : [ "modinput_functional" ]
1757
- python39 : true
1758
1759
container :
1759
1760
image : ghcr.io/splunk/workflow-engine-base:2.0.12
1760
1761
env :
0 commit comments