Skip to content

Commit

Permalink
Merge branch 'devel' into filter-dependabot-branches
Browse files Browse the repository at this point in the history
  • Loading branch information
dfarrell07 authored Jan 3, 2024
2 parents e8adaba + a382e54 commit cd62aef
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/consuming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
fail-fast: false
matrix:
project: [
'admiral', 'cloud-prepare', 'coastguard', 'lighthouse',
'admiral', 'cloud-prepare', 'lighthouse',
'subctl', 'submariner', 'submariner-charts', 'submariner-operator'
]
steps:
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
fail-fast: false
matrix:
project: [
'admiral', 'cloud-prepare', 'coastguard', 'lighthouse',
'admiral', 'cloud-prepare', 'lighthouse',
'subctl', 'submariner', 'submariner-charts', 'submariner-operator'
]
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Check out the repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Run Anchore vulnerability scanner
uses: anchore/scan-action@896d5f410043987c8fe18f60d91bf199e436840c
uses: anchore/scan-action@65161264d84bfeed55775e43bdbe5eb7c8a433fb
id: scan
with:
path: "."
Expand All @@ -123,7 +123,7 @@ jobs:
run: cat ${{ steps.scan.outputs.sarif }}
- name: Upload Anchore scan SARIF report
if: always()
uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4
with:
sarif_file: ${{ steps.scan.outputs.sarif }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fail-fast: false
matrix:
project: [
'admiral', 'cloud-prepare', 'coastguard', 'lighthouse', 'shipyard',
'admiral', 'cloud-prepare', 'lighthouse', 'shipyard',
'subctl', 'submariner-bot', 'submariner', 'submariner-operator'
]
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
- name: Check out the repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Run Anchore vulnerability scanner
uses: anchore/scan-action@896d5f410043987c8fe18f60d91bf199e436840c
uses: anchore/scan-action@65161264d84bfeed55775e43bdbe5eb7c8a433fb
id: scan
with:
path: "."
fail-build: false
- name: Show Anchore scan SARIF report
run: cat ${{ steps.scan.outputs.sarif }}
- name: Upload Anchore scan SARIF report
uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4
with:
sarif_file: ${{ steps.scan.outputs.sarif }}

0 comments on commit cd62aef

Please sign in to comment.