diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2020-05-19 14:01:05 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2020-05-19 14:01:05 +0300 |
| commit | 6d3a0ace6d73c41e7c2442e84b2cab6fe1ade22f (patch) | |
| tree | 0d223831b471357b40c4ebbea4e5c9818aaee3cb /.gitlab-ci.yml | |
| parent | 7fc40304d81069da9f9dc1f201714ae7a848f708 (diff) | |
| parent | e7aaafad18934d57c8046fd641834fac344854ae (diff) | |
Merge branch 'add-domain-source-config' into 'master'
Add domain-config-source flag
See merge request gitlab-org/gitlab-pages!284
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33f20858..c05e641b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - template: Security/License-Management.gitlab-ci.yml + - template: Security/License-Scanning.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml - template: Security/Dependency-Scanning.gitlab-ci.yml @@ -50,13 +50,23 @@ default: paths: - bin/gitlab-pages -license_management: +license_scanning: stage: prepare variables: LICENSE_MANAGEMENT_SETUP_CMD: go mod vendor + rules: + - if: $CI_MERGE_REQUEST_ID + when: on_success + - if: $CI_COMMIT_BRANCH == 'master' + when: on_success sast: stage: prepare + rules: + - if: $CI_MERGE_REQUEST_ID + when: on_success + - if: $CI_COMMIT_BRANCH == 'master' + when: on_success download deps: extends: .go-mod-cache |