a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3368 from cdr/jsjoeio/re-enable-trivy 

fix(ci): re-enable trivy-scan-repo
This commit is contained in:
Joe Previte 2021-05-14 10:47:57 -07:00 committed by GitHub
parent f5b792706a 5fe76bdecf
commit 36265ddfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yaml vendored
View File

@ -446,8 +446,8 @@ jobs:
path: ./release-images path: ./release-images
- name: Run Trivy vulnerability scanner in image mode - name: Run Trivy vulnerability scanner in image mode
# Commit SHA for v0.0.14 # Commit SHA for v0.0.17
uses: aquasecurity/trivy-action@341f810bd602419f966a081da3f4debedc3e5c8e uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b
with: with:
input: "./release-images/code-server-amd64-*.tar" input: "./release-images/code-server-amd64-*.tar"
scan-type: "image" scan-type: "image"
@ -466,16 +466,12 @@ jobs:
# codeql/upload-sarif action per job # codeql/upload-sarif action per job
trivy-scan-repo: trivy-scan-repo:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
# NOTE@jsjoeio 5/10/2021
# Disabling until fixed upstream
# See: https://github.com/aquasecurity/trivy-action/issues/22#issuecomment-833768084
if: "1 == 2"
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Run Trivy vulnerability scanner in repo mode - name: Run Trivy vulnerability scanner in repo mode
#Commit SHA for v0.0.14 #Commit SHA for v0.0.17
uses: aquasecurity/trivy-action@341f810bd602419f966a081da3f4debedc3e5c8e uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b
with: with:
scan-type: "fs" scan-type: "fs"
scan-ref: "." scan-ref: "."

1
CHANGELOG.md
View File

@ -75,6 +75,7 @@ VS Code v1.56
- chore: ignore updates to microsoft/playwright-github-action - chore: ignore updates to microsoft/playwright-github-action
- fix(socket): use xdgBasedir.runtime instead of tmp #3304 @jsjoeio - fix(socket): use xdgBasedir.runtime instead of tmp #3304 @jsjoeio
- fix(ci): re-enable trivy-scan-repo #3368 @jsjoeio
## 3.10.0 ## 3.10.0