diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index b37e3048e..7ffcd9bb0 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -223,6 +223,7 @@ jobs: matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }} matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }} matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }} + matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }} permissions: contents: write packages: read @@ -233,9 +234,14 @@ jobs: persist-credentials: false - id: matrix uses: splunk/addonfactory-test-matrix-action@v2.1 + - id: combined_Splunkmatrix + run: | + splunk='{"version":"splunk-OpenSSL3-9081ea6b9138", "build":"9081ea6b9138", "islatest":false, "isoldest":false}' + combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]') + echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT" - name: job summary run: | - splunk_version_list=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq -r '.[].version') + splunk_version_list=$(echo '${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}' | jq -r '.[].version') sc4s_version_list=$(echo '${{ steps.matrix.outputs.supportedSC4S }}' | jq -r '.[].version') echo -e "## Summary of Versions Used\n- **Splunk versions used:** (${splunk_version_list})\n- **SC4S versions used:** (${sc4s_version_list})\n- Browser: Chrome" >> "$GITHUB_STEP_SUMMARY" fossa-scan: @@ -1001,7 +1007,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }} container: image: ghcr.io/splunk/workflow-engine-base:4.1.0 @@ -1269,9 +1275,8 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }} - container: image: ghcr.io/splunk/workflow-engine-base:4.1.0 env: @@ -1524,7 +1529,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} browser: [ "chrome" ] vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }} marker: ${{ fromJson(inputs.ui_marker) }} @@ -1801,7 +1806,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} modinput-type: [ "modinput_functional" ] vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }} marker: ${{ fromJson(inputs.marker) }} @@ -2076,7 +2081,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} os: ${{ fromJson(inputs.scripted-inputs-os-list) }} container: image: ghcr.io/splunk/workflow-engine-base:4.1.0