@@ -230,6 +230,7 @@ jobs:
230230      container_base : ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }} 
231231      matrix_supportedSplunk : ${{ steps.matrix.outputs.supportedSplunk }} 
232232      matrix_latestSplunk : ${{ steps.matrix.outputs.latestSplunk }} 
233+       matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }} 
233234      matrix_supportedSC4S : ${{ steps.matrix.outputs.supportedSC4S }} 
234235      matrix_supportedModinputFunctionalVendors : ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }} 
235236      matrix_supportedUIVendors : ${{ steps.matrix.outputs.supportedUIVendors }} 
@@ -276,6 +277,12 @@ jobs:
276277        run : | 
277278          echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT" 
278279          echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}"  >> "$GITHUB_OUTPUT" 
280+ name : combined_Splunkmatrix 
281+         id : combined_Splunkmatrix 
282+         run : | 
283+             combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}'  | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]') 
284+             echo "combinedSplunkversions=$(echo "$combinedSplunkversions"| jq -c .)" >> "$GITHUB_OUTPUT" 
285+ 
279286
280287fossa-scan :
281288    runs-on : ubuntu-latest 
@@ -1709,19 +1716,13 @@ jobs:
17091716      - meta 
17101717      - setup-workflow 
17111718    runs-on : ubuntu-latest 
1712-     continue-on-error : ${{ matrix.python39 }} 
17131719    strategy :
17141720      fail-fast : false 
17151721      matrix :
1716-         splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }} 
1722+         splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }} 
17171723        modinput-type : [ "modinput_functional" ] 
17181724        vendor-version : ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }} 
17191725        marker : ${{ fromJson(inputs.marker) }} 
1720-         python39 : [false] 
1721-         include :
1722-             - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }} 
1723-               modinput-type : [ "modinput_functional" ] 
1724-               python39 : true 
17251726    container :
17261727      image : ghcr.io/splunk/workflow-engine-base:2.0.3 
17271728    env :
0 commit comments