Skip to content

Commit 38d93c9

Browse files
Merge branch 'master' into snyk-fix-9119112e51c2cb62aa4bd67be2067f7d
2 parents 01ae389 + e81963e commit 38d93c9

File tree

5 files changed

+16
-22
lines changed

5 files changed

+16
-22
lines changed

.circleci/config.yml

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

100100
cyrun:
101101
docker:
102-
- image: cypress/base:16.16.0
102+
- image: cypress/base:16.18.1
103103
parameters:
104104
jobname:
105105
type: string
@@ -125,7 +125,7 @@ jobs:
125125

126126
test-code-coverage-plugin:
127127
docker:
128-
- image: cypress/base:16.16.0
128+
- image: cypress/base:16.18.1
129129
steps:
130130
- attach_workspace:
131131
at: ~/

.github/workflows/snyk_sca_scan.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Snyk Software Composition Analysis Scan
22
on:
3-
push:
4-
branches:
5-
- '*'
63
pull_request:
74
branches:
85
- master
@@ -25,4 +22,4 @@ jobs:
2522
env:
2623
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}
2724
with:
28-
args: --debug --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=critical
25+
args: --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=critical

.github/workflows/snyk_static_analysis_scan.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Snyk Static Analysis Scan
22
# This SAST (Static Application Security Testing) scan is used to scan
33
# our first-party code for security vulnerabilities
44
on:
5-
push:
6-
branches:
7-
- '*'
85
pull_request:
96
branches:
107
- master
@@ -19,4 +16,4 @@ jobs:
1916
env:
2017
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}
2118
continue-on-error: true
22-
run: snyk code test --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=high
19+
run: snyk code test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=high

test-apps/new-cypress-config/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-apps/old-cypress-config/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)