diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-03-05 08:34:22 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-03-05 08:34:22 +0300 |
| commit | d14d67f0fb1cb9e53f1ccd9311a2c19c5517b17a (patch) | |
| tree | 551dbb6b0ab36c10ea7c54e09ec2a2c4888ba257 | |
| parent | 6b6adc038c1ae51cd552a344959fd52dd3508ea8 (diff) | |
| parent | 6688625a6d324884174a3f0ac5d7db0d9c1b039c (diff) | |
Merge branch 'zj-add-license-check-to-ci' into 'master'
Add GitLabs license management to Gitaly's CI
Closes #1521
See merge request gitlab-org/gitaly!1076
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-add-license-check-to-ci.yml | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f483a3bf..898a8a1c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,3 +192,17 @@ update-downstream-server-version: script: - ruby _support/update-downstream-server-version allow_failure: true + +license_management: + variables: + SETUP_CMD: "echo 'Skipping Ruby setup, only checking Go dependencies'" + image: + name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable" + entrypoint: [""] + stage: test + allow_failure: true + script: + - /run.sh analyze . + artifacts: + reports: + license_management: gl-license-management-report.json diff --git a/changelogs/unreleased/zj-add-license-check-to-ci.yml b/changelogs/unreleased/zj-add-license-check-to-ci.yml new file mode 100644 index 000000000..d23566506 --- /dev/null +++ b/changelogs/unreleased/zj-add-license-check-to-ci.yml @@ -0,0 +1,5 @@ +--- +title: Use GitLab for License management +merge_request: 1076 +author: +type: other |