diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-16 23:17:42 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-19 14:04:44 -0200 |
| commit | 17b9d86ad7d594e169441c7be490b398cfa9e725 (patch) | |
| tree | 15206222fbc18e1b8c51c44450d9ee991975b5e6 | |
| parent | 6f1c38d232e4d3c62ee3a7c71c62aa68cf1d00fa (diff) | |
| download | gitlab-ce-17b9d86ad7d594e169441c7be490b398cfa9e725.tar.gz | |
Merge branch 'skip-sast-on-ce' into 'master'
Avoid running autodevops sast job on GitLab CE
Closes gl-sast#3
See merge request gitlab-org/gitlab-ce!15962
(cherry picked from commit 169a8c35847a925597ed1abb9225c722fc9ed8ee)
8153f734 Avoid running autodevops sast job on GitLab CE
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index da4d86b9a04..275487071f3 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -89,7 +89,7 @@ sast: POSTGRES_DB: "false" allow_failure: true script: - - /app/bin/run . + - sast . artifacts: paths: [gl-sast-report.json] @@ -232,6 +232,17 @@ production: docker run ${cc_opts} codeclimate/codeclimate:0.69.0 analyze -f json > codeclimate.json } + function sast() { + case "$CI_SERVER_VERSION" in + *-ee) + /app/bin/run "$@" + ;; + *) + echo "GitLab EE is required" + ;; + esac + } + function deploy() { track="${1-stable}" name="$CI_ENVIRONMENT_SLUG" |