Skip to content

Commit e73e788

Browse files
committed
fix nightlies
1 parent 221986c commit e73e788

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

.github/workflows/container-scan.yml

+19-18
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,14 @@ jobs:
297297
# This is where you will need to introduce the Snyk API token created with your Snyk account
298298
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
299299

300+
# Replace any "undefined" security severity values with 0. The undefined value is used in the case
301+
# of license-related findings, which do not do not indicate a security vulnerability.
302+
# See https://github.com/github/codeql-action/issues/2187 for more context.
303+
- name: Post-process sarif output
304+
run: |
305+
sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk-code.sarif
300306
# Push the Snyk Code results into GitHub Code Scanning tab
307+
301308
- name: Upload result to GitHub Code Scanning
302309
uses: github/codeql-action/upload-sarif@v3
303310
with:
@@ -352,29 +359,23 @@ jobs:
352359
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
353360
runs-on: ubuntu-latest
354361
steps:
355-
- uses: actions/checkout@v4
356-
- name: Set up Snyk CLI to check for security issues
357-
# Snyk can be used to break the build when it detects security issues.
358-
# In this case we want to upload the SAST issues to GitHub Code Scanning
359-
uses: snyk/actions/setup@master
360-
env:
361-
# This is where you will need to introduce the Snyk API token created with your Snyk account
362-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
363-
364-
- name: Snyk auth
365-
shell: bash
366-
run: snyk config set api=$SNYK_TOKEN
367-
env:
368-
# This is where you will need to introduce the Snyk API token created with your Snyk account
369-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
370-
371362
- name: Snyk Container test
363+
uses: snyk/actions/docker@master
372364
continue-on-error: true
373-
shell: bash
374-
run: snyk container test traefik:v2.11.0 --sarif --sarif-file-output=snyk-code.sarif
375365
env:
376366
# This is where you will need to introduce the Snyk API token created with your Snyk account
377367
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
368+
with:
369+
image: traefik:v2.11.0
370+
args: --sarif --sarif-file-output=snyk-code.sarif
371+
372+
# Replace any "undefined" security severity values with 0. The undefined value is used in the case
373+
# of license-related findings, which do not do not indicate a security vulnerability.
374+
# See https://github.com/github/codeql-action/issues/2187 for more context.
375+
- name: Post-process sarif output
376+
run: |
377+
sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk-code.sarif
378+
# Push the Snyk Code results into GitHub Code Scanning tab
378379

379380
# Push the Snyk Code results into GitHub Code Scanning tab
380381
- name: Upload result to GitHub Code Scanning

.github/workflows/pr-tests-stack-public.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
strategy:
1919
max-parallel: 99
2020
matrix:
21-
os: [ubuntu-latest, macos-latest, windows]
21+
# issues with macos 14 arm https://github.com/crazy-max/ghaction-setup-docker/pull/53
22+
os: [ubuntu-latest, macos-13, windows]
2223
python-version: ["3.12"]
2324
pytest-modules: ["frontend network"]
2425
fail-fast: false
@@ -117,11 +118,11 @@ jobs:
117118
chmod +x ~/.docker/cli-plugins/docker-compose
118119
119120
- name: Docker on MacOS
120-
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
121-
uses: crazy-max/ghaction-setup-docker@v3.1.0
121+
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-13'
122+
uses: crazy-max/ghaction-setup-docker@v3.2.0
122123

123124
- name: Docker Compose on MacOS
124-
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
125+
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-13'
125126
shell: bash
126127
run: |
127128
brew install docker-compose

0 commit comments

Comments
 (0)