diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-01-17 18:15:47 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-01-17 18:15:47 +0300 |
| commit | a63c1d318e164432173ab2d1d4182d6a79fc6214 (patch) | |
| tree | 8ff9208bc60b8d16dc8a00d92f20135d29177228 | |
| parent | 8912bf9de7764e3b7590d3f2c0837bba573308d0 (diff) | |
| parent | 7dc12a5c9f07c313b568bdfaa33dbce67df45d37 (diff) | |
Merge branch 'jv-fix-ci-variables' into 'master'
CI: merge variable declaration blocks
See merge request gitlab-org/gitaly!1765
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7338722d5..45a238162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,8 @@ stages: variables: DOCKER_DRIVER: overlay2 CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.24 + SAST_DISABLE_DIND: "true" + SAST_DEFAULT_ANALYZERS: "gosec" danger-review: image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger @@ -191,10 +193,6 @@ include: - template: Security/License-Management.gitlab-ci.yml - template: SAST.gitlab-ci.yml -variables: - SAST_DISABLE_DIND: "true" - SAST_DEFAULT_ANALYZERS: "gosec" - gosec-sast: before_script: - apk add pkgconfig libgit2-dev gcc libc-dev |