diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2020-06-03 05:15:54 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2020-06-03 05:15:54 +0000 |
| commit | c086476dd1d0c147217c6a2877fa60d2dd799a15 (patch) | |
| tree | e7d7504a815c84d94a49e86e63cf8744e6cbd126 | |
| parent | 131771a66fb9f0366d31f20229358820f3bfa07b (diff) | |
| parent | e431247a262952c6dcec6853f37a055448b257b6 (diff) | |
| download | gitlab-shell-c086476dd1d0c147217c6a2877fa60d2dd799a15.tar.gz | |
Merge branch 'pb-update-gitlab-ci-codequality' into 'master'
Use codequality CI template
See merge request gitlab-org/gitlab-shell!389
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9c1744..d54fa1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,11 @@ +include: + - template: Code-Quality.gitlab-ci.yml + variables: DOCKER_VERSION: "19.03.0" workflow: - rules: + rules: &workflow_rules # For merge requests, create a pipeline. - if: '$CI_MERGE_REQUEST_IID' # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.). @@ -61,18 +64,9 @@ race: script: - make test_golang_race -codequality: +code_quality: extends: .use-docker-in-docker - allow_failure: true - script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + rules: *workflow_rules sast: extends: .use-docker-in-docker |