Skip to content

Commit 7d767cb

Browse files
authored
Merge branch 'dotnet' into dependabot/github_actions/github/codeql-action-3
2 parents 00be4fe + 40ac795 commit 7d767cb

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

.github/workflows/build-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Docker meta
111111
id: meta
112-
uses: docker/metadata-action@v4
112+
uses: docker/metadata-action@v5
113113
with:
114114
labels: |
115115
org.opencontainers.image.name=${{ github.ACTOR }}/${{ env.RELEASE_IMAGE_NAME }}
@@ -195,7 +195,7 @@ jobs:
195195
# password: ${{ secrets.GITHUB_TOKEN }}
196196
# - name: Docker meta
197197
# id: meta
198-
# uses: docker/metadata-action@v4
198+
# uses: docker/metadata-action@v5
199199
# with:
200200
# labels: |
201201
# org.opencontainers.image.name=${{ vars.BASE_IMAGE }}

.github/workflows/build-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
password: ${{ secrets.GITHUB_TOKEN }}
100100
- name: Docker meta
101101
id: meta
102-
uses: docker/metadata-action@v4
102+
uses: docker/metadata-action@v5
103103
with:
104104
labels: |
105105
org.opencontainers.image.name=${{ github.ACTOR }}/${{ env.RELEASE_IMAGE_NAME }}

.github/workflows/snyk-security.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ jobs:
126126
- name: Snyk Code test
127127
env:
128128
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
129-
run: snyk code test --sarif > snyk-code.sarif || true
129+
run: |
130+
snyk auth ${{ secrets.SNYK_TOKEN }}
131+
snyk code test --sarif > snyk-code.sarif || true
130132
131133
# # Build the docker image for testing
132134
# - name: Build a Docker image
@@ -138,26 +140,34 @@ jobs:
138140
- name: Container test
139141
env:
140142
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
141-
run: snyk container test --print-deps ${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} \
143+
run: |
144+
snyk auth ${{ secrets.SNYK_TOKEN }}
145+
snyk container test --print-deps ${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} \
142146
--username=${{ secrets.DOCKER_USER }} --password=${{ secrets.DOCKER_TOKEN }} --file=${{ env.DOCKERFILE }} .
143147
144148
- name: Container test
145149
env:
146150
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
147-
run: snyk container test --print-deps ghcr.io/${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} \
151+
run: |
152+
snyk auth ${{ secrets.SNYK_TOKEN }}
153+
snyk container test --print-deps ghcr.io/${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} \
148154
--username=${{ secrets.DOCKER_USER }} --password=${{ secrets.DOCKER_TOKEN }} --file=${{ env.DOCKERFILE }} .
149155
150156
# Runs Snyk Container (Container and SCA) analysis and uploads result to Snyk.
151157
- name: Snyk Container monitor
152158
env:
153159
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
154-
run: snyk container monitor ${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} --file=${{ env.DOCKERFILE }}
160+
run: |
161+
snyk auth ${{ secrets.SNYK_TOKEN }}
162+
snyk container monitor ${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} --file=${{ env.DOCKERFILE }}
155163
156164
# Runs Snyk Container (Container and SCA) analysis and uploads result to Snyk.
157165
- name: Snyk Container monitor
158166
env:
159167
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
160-
run: snyk container monitor ghcr.io/${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} --file=${{ env.DOCKERFILE }}
168+
run: |
169+
snyk auth ${{ secrets.SNYK_TOKEN }}
170+
snyk container monitor ghcr.io/${{ secrets.DOCKER_USER }}/${{ env.RELEASE_IMAGE_NAME }} --file=${{ env.DOCKERFILE }}
161171
162172
# Push the Snyk Code results into GitHub Code Scanning tab
163173
- name: Upload result to GitHub Code Scanning
@@ -167,4 +177,6 @@ jobs:
167177

168178
# Runs Snyk Open Source (SCA) analysis and uploads result to Snyk.
169179
- name: Snyk Open Source monitor
170-
run: snyk monitor --all-projects
180+
run: |
181+
snyk auth ${{ secrets.SNYK_TOKEN }}
182+
snyk monitor --all-projects

0 commit comments

Comments
 (0)