Skip to content

Commit c17f1a8

Browse files
fix: update matrix action remove unreleased splunk (#306)
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
1 parent 65fa96c commit c17f1a8

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

.github/workflows/reusable-build-test-release.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ jobs:
176176
meta:
177177
runs-on: ubuntu-latest
178178
outputs:
179+
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
179180
matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }}
180181
matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }}
181-
matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
182182
matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
183183
matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }}
184184
permissions:
@@ -190,13 +190,7 @@ jobs:
190190
submodules: false
191191
persist-credentials: false
192192
- id: matrix
193-
uses: splunk/addonfactory-test-matrix-action@v2.0.2
194-
- name: Combined Splunk and SC4S Versions
195-
id: combined_Splunkmatrix
196-
run: |
197-
splunk='{"version":"unreleased-python3_9-f8b1a92a256b", "build":"7027496d63d8", "islatest":false, "isoldest":false}'
198-
combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]')
199-
echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT"
193+
uses: splunk/addonfactory-test-matrix-action@v2.1
200194

201195
fossa-scan:
202196
runs-on: ubuntu-latest
@@ -922,7 +916,7 @@ jobs:
922916
strategy:
923917
fail-fast: false
924918
matrix:
925-
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
919+
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
926920
sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
927921

928922
container:
@@ -1155,7 +1149,7 @@ jobs:
11551149
strategy:
11561150
fail-fast: false
11571151
matrix:
1158-
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
1152+
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
11591153
sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
11601154

11611155
container:
@@ -1366,7 +1360,7 @@ jobs:
13661360
strategy:
13671361
fail-fast: false
13681362
matrix:
1369-
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
1363+
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
13701364
browser: [ "chrome" ]
13711365
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }}
13721366
marker: ${{ fromJson(inputs.ui_marker) }}
@@ -1599,7 +1593,7 @@ jobs:
15991593
strategy:
16001594
fail-fast: false
16011595
matrix:
1602-
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
1596+
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
16031597
modinput-type: [ "modinput_functional" ]
16041598
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
16051599
marker: ${{ fromJson(inputs.marker) }}
@@ -1830,7 +1824,7 @@ jobs:
18301824
strategy:
18311825
fail-fast: false
18321826
matrix:
1833-
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
1827+
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
18341828
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" ]
18351829
container:
18361830
image: ghcr.io/splunk/workflow-engine-base:4.1.0

0 commit comments

Comments
 (0)