Skip to content

Commit 7b11784

Browse files
committed
Fix merging objects - deep merge varialbes, stages, extends
1 parent 9b88cde commit 7b11784

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ stages:
44
- build
55
- test
66

7+
variables:
8+
ESLINT_FAILURE_ALLOWED: "false"
9+
710
include:
811
- local: Security/SAST.gitlab-ci.yml
912
- template: Security/DAST.gitlab-ci.yml

Security/SAST.gitlab-ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ sast:
3636
# see https://gitlab.com/gitlab-org/gitlab/-/issues/218444
3737
script:
3838
- /analyzer run
39-
- if [ "`which node | grep '/bin/node$'`" == "" ]; then apk add nodejs npm; fi
40-
- if [ "$SAST_FAILURE_ALLOWED" == "false" ]; then npm install simplify-security; fi
41-
- if [ "$SAST_FAILURE_ALLOWED" == "false" ]; then node node_modules/simplify-security/entrypoint.js report -i gl-sast-report.json; fi
4239

4340
eslint-sast:
4441
extends: .sast-analyzer

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"dotenv": "^8.2.0",
2828
"readline-sync": "^1.4.10",
2929
"simplify-sdk": "^0.1.52",
30+
"simplify-security": "^0.1.14",
3031
"uuid": "^8.3.1",
3132
"yaml": "^1.10.2",
3233
"yargs": "^15.4.1"

0 commit comments

Comments
 (0)