Skip to content

Commit d4002b6

Browse files
pbajaj-crestharshilgajera-crestkdoroszko-splunk
authored
fix: update AppInspect CLI action to v2.5 #247 (#248)
[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: harshilgajera-crest <69803385+harshilgajera-crest@users.noreply.github.com> Co-authored-by: kdoroszko-splunk <kdoroszko@splunk.com>
1 parent 34abe48 commit d4002b6

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ jobs:
261261
container_base: ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
262262
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
263263
matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }}
264+
matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
264265
matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }}
265266
matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
266267
matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }}
@@ -307,6 +308,12 @@ jobs:
307308
run: |
308309
echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT"
309310
echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}" >> "$GITHUB_OUTPUT"
311+
- name: combined_Splunkmatrix
312+
id: combined_Splunkmatrix
313+
run: |
314+
combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]')
315+
echo "combinedSplunkversions=$(echo "$combinedSplunkversions"| jq -c .)" >> "$GITHUB_OUTPUT"
316+
310317
311318
fossa-scan:
312319
runs-on: ubuntu-latest
@@ -872,7 +879,7 @@ jobs:
872879
name: package-splunkbase
873880
path: build/package/
874881
- name: Scan
875-
uses: splunk/appinspect-cli-action@v2.4
882+
uses: splunk/appinspect-cli-action@v2.5
876883
with:
877884
app_path: build/package/
878885
included_tags: ${{ matrix.tags }}
@@ -1742,19 +1749,13 @@ jobs:
17421749
- meta
17431750
- setup-workflow
17441751
runs-on: ubuntu-latest
1745-
continue-on-error: ${{ matrix.python39 }}
17461752
strategy:
17471753
fail-fast: false
17481754
matrix:
1749-
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
1755+
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
17501756
modinput-type: [ "modinput_functional" ]
17511757
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
17521758
marker: ${{ fromJson(inputs.marker) }}
1753-
python39: [false]
1754-
include:
1755-
- splunk: ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1756-
modinput-type: [ "modinput_functional" ]
1757-
python39: true
17581759
container:
17591760
image: ghcr.io/splunk/workflow-engine-base:2.0.12
17601761
env:

0 commit comments

Comments
 (0)