diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index ea4699ff2..74972470c 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -261,6 +261,7 @@ jobs: container_base: ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }} matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }} matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }} + matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }} matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }} matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }} matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }} @@ -307,6 +308,12 @@ 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: | + combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]') + echo "combinedSplunkversions=$(echo "$combinedSplunkversions"| jq -c .)" >> "$GITHUB_OUTPUT" + fossa-scan: runs-on: ubuntu-latest @@ -872,7 +879,7 @@ jobs: name: package-splunkbase path: build/package/ - name: Scan - uses: splunk/appinspect-cli-action@v2.4 + uses: splunk/appinspect-cli-action@v2.5 with: app_path: build/package/ included_tags: ${{ matrix.tags }} @@ -1742,19 +1749,13 @@ jobs: - meta - setup-workflow runs-on: ubuntu-latest - continue-on-error: ${{ matrix.python39 }} 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) }} - python39: [false] - include: - - splunk: ${{ fromJson(needs.meta.outputs.python39_splunk) }} - modinput-type: [ "modinput_functional" ] - python39: true container: image: ghcr.io/splunk/workflow-engine-base:2.0.12 env: