From 2a5af03609d9dd524b08c38481143b9de365e839 Mon Sep 17 00:00:00 2001 From: harshilgajera-crest <69803385+harshilgajera-crest@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:09:13 +0530 Subject: [PATCH 1/3] fix: combining splunk versions (#246) Added stage to combine splunk versions an use it in modinput test job. Job in AWS addon where modinut is running successfully with python3.9 (Matrix of 24 jobs 3*8): https://github.com/splunk/splunk-add-on-for-amazon-web-services/actions/runs/8431526533 Job in MSCS addon : https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/8431532363 --- .github/workflows/reusable-build-test-release.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index 8f7acf241..6558c7c09 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -230,6 +230,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 }} @@ -276,6 +277,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 @@ -1709,19 +1716,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.3 env: From f7102a7330f3587c783c51de8a0a66ba68674038 Mon Sep 17 00:00:00 2001 From: pbajaj-crest <164004542+pbajaj-crest@users.noreply.github.com> Date: Thu, 28 Mar 2024 15:03:43 +0530 Subject: [PATCH 2/3] fix: update AppInspect CLI action to v2.5 (#247) Release version 2.5 for reusable build test release. [https://github.com/splunk/appinspect-cli-action/releases/tag/v2.5.0](url) [https://dev.splunk.com/enterprise/docs/relnotes/relnotes-appinspectcli/whatsnew/#v3502024-03-27](url) [https://github.com/splunk/splunk-add-on-for-google-workspace/actions/runs/8464669953](url) Co-authored-by: kdoroszko-splunk --- .github/workflows/reusable-build-test-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index 6558c7c09..f9b1b2d23 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -792,7 +792,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 }} From bfc6713ae18936336e19d079d75e06047adbcbe8 Mon Sep 17 00:00:00 2001 From: Marcin Bruzda <94437843+mbruzda-splunk@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:50:13 +0200 Subject: [PATCH 3/3] fix: update appinspect-cli-action to v2.6 (#253) Test run: https://github.com/splunk/splunk-add-on-for-microsoft-sysmon/actions/runs/8646585224 --- .github/workflows/reusable-build-test-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index f9b1b2d23..4320ab06c 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -792,7 +792,7 @@ jobs: name: package-splunkbase path: build/package/ - name: Scan - uses: splunk/appinspect-cli-action@v2.5 + uses: splunk/appinspect-cli-action@v2.6 with: app_path: build/package/ included_tags: ${{ matrix.tags }}