Skip to content

Commit

Permalink
fix: update matrix action remove unreleased splunk (#306)
Browse files Browse the repository at this point in the history
This PR updates matrix-action and sets version to minor so any patch
updates on matrix-action repo are consumed automatically.
With new matrix-action Splunk 9.3.0 is shipped which by default uses
python 3.9:
https://docs.splunk.com/Documentation/Splunk/9.3.0/ReleaseNotes/MeetSplunk
Hence code related with unreleased-python-3_9 Splunk is removed.

tests:

https://github.com/splunk/splunk-add-on-for-google-cloud-platform/actions/runs/10194294389

https://github.com/splunk/splunk-add-on-for-mysql/actions/runs/10194312540

https://github.com/splunk/splunk-add-on-for-servicenow/actions/runs/10194305287

JBoss: splunk/splunk-add-on-for-jboss#444
Unix:
splunk/splunk-add-on-for-unix-and-linux#579
  • Loading branch information
mkolasinski-splunk authored Aug 5, 2024
1 parent 65fa96c commit c17f1a8
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/reusable-build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ jobs:
meta:
runs-on: ubuntu-latest
outputs:
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }}
matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }}
matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }}
permissions:
Expand All @@ -190,13 +190,7 @@ jobs:
submodules: false
persist-credentials: false
- id: matrix
uses: splunk/[email protected]
- name: Combined Splunk and SC4S Versions
id: combined_Splunkmatrix
run: |
splunk='{"version":"unreleased-python3_9-f8b1a92a256b", "build":"7027496d63d8", "islatest":false, "isoldest":false}'
combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]')
echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT"
uses: splunk/[email protected]

fossa-scan:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -922,7 +916,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}

container:
Expand Down Expand Up @@ -1155,7 +1149,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}

container:
Expand Down Expand Up @@ -1366,7 +1360,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
browser: [ "chrome" ]
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }}
marker: ${{ fromJson(inputs.ui_marker) }}
Expand Down Expand Up @@ -1599,7 +1593,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
modinput-type: [ "modinput_functional" ]
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
marker: ${{ fromJson(inputs.marker) }}
Expand Down Expand Up @@ -1830,7 +1824,7 @@ jobs:
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
os: [ "ubuntu:14.04", "ubuntu:16.04","ubuntu:18.04","ubuntu:22.04", "centos:7", "redhat:8.0", "redhat:8.2", "redhat:8.3", "redhat:8.4", "redhat:8.5" ]
container:
image: ghcr.io/splunk/workflow-engine-base:4.1.0
Expand Down

0 comments on commit c17f1a8

Please sign in to comment.