From c5f1ed4c6e39173f7ad433c021d204868e223ab6 Mon Sep 17 00:00:00 2001 From: harshilgajera-crest <69803385+harshilgajera-crest@users.noreply.github.com> Date: Thu, 21 Mar 2024 19:08:35 +0530 Subject: [PATCH] adding new step in meta --- .github/workflows/reusable-build-test-release.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index 877524f83..f5ed246b2 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -262,6 +262,7 @@ jobs: matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }} matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }} matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }} + matrix_combinedSplunkversion: ${{ steps.matrix.outputs.combinedSplunkversions }} matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }} matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }} python39_splunk: ${{steps.python39_splunk.outputs.splunk}} @@ -307,6 +308,13 @@ jobs: run: | echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT" echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}" >> "$GITHUB_OUTPUT" + - name: combined_Splunkmatrix + id: combined_Splunkmatrix + run: | + echo "combinedSplunkversions=$(jq --arg combined_spluk_version $python39_splunk '. + [$combined_spluk_version]' <<< "$matrix_supportedSplunk")" >> "$GITHUB_OUTPUT" + with: + python39_splunk: ${{steps.python39_splunk.outputs.splunk}} + matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }} fossa-scan: runs-on: ubuntu-latest @@ -1745,7 +1753,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ toJson(fromJson(needs.meta.outputs.matrix_supportedSplunk) + fromJson(needs.meta.outputs.python39_splunk)) }} + splunk: ${{ needs.meta.outputs.fromJson(matrix_combinedSplunkversion) }} modinput-type: [ "modinput_functional" ] vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }} marker: ${{ fromJson(inputs.marker) }}