diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-24 12:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-24 12:07:53 +0300 |
| commit | 52b219b6f40e49471c66765a95a550f6de256b6a (patch) | |
| tree | 37102bf58bd19bb23ab99bf940763a0d5311965b /.gitlab | |
| parent | 9933e246c88dfa3d62eb0bab258539711663b904 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index c3f14011c5b..fc98f771344 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -108,26 +108,30 @@ start-review-app-pipeline: - artifact: review-app-pipeline.yml job: e2e-test-pipeline-generate -include: - - project: gitlab-org/quality/pipeline-common - ref: 5.2.2 - file: - - /ci/danger-review.yml - danger-review: extends: - .default-retry - .ruby-node-cache - .review:rules:danger - image: "${DEFAULT_CI_IMAGE}" + stage: test + needs: [] before_script: - source scripts/utils.sh - bundle_install_script "--with danger" - yarn_install_script + script: + # ${DANGER_DANGERFILE} is used by Jihulab for customizing danger support: https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/jh/.gitlab-ci.yml + - > + if [ -z "$DANGER_GITLAB_API_TOKEN" ]; then + run_timed_command danger_as_local + else + danger_id=$(echo -n ${DANGER_GITLAB_API_TOKEN} | md5sum | awk '{print $1}' | cut -c5-10) + run_timed_command "bundle exec danger --fail-on-errors=true --verbose --danger_id=\"${danger_id}\" --dangerfile=\"${DANGER_DANGERFILE:-Dangerfile}\"" + fi danger-review-local: - extends: danger-review - before_script: - - !reference ["danger-review", "before_script"] - # We unset DANGER_GITLAB_API_TOKEN so that Danger will run as local from `danger-review:script` - - unset DANGER_GITLAB_API_TOKEN + extends: + - danger-review + - .review:rules:danger-local + script: + - run_timed_command danger_as_local |