From ab4bc8bcbff5c7a862e52df356d75cdf991ac6a1 Mon Sep 17 00:00:00 2001
From: LXY <3008996-LXY1226@users.noreply.gitlab.com>
Date: Thu, 11 Aug 2022 20:21:31 +0000
Subject: [PATCH] Refactor danger using environment to detect `jh` directory
Co-Authored-By: @godfat-gitlab
---
.gitlab/ci/review.gitlab-ci.yml | 3 ++-
scripts/utils.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 72dbb6443957..4f51409d6a83 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -85,12 +85,13 @@ danger-review:
- bundle_install_script "--with danger"
- run_timed_command "retry yarn install --frozen-lockfile"
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}"
+ run_timed_command "bundle exec danger --fail-on-errors=true --verbose --danger_id=\"${danger_id}\" --dangerfile=\"${DANGER_DANGERFILE:-Dangerfile}\""
fi
danger-review-local:
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 335b2eb41e7c..8db525abc933 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -181,5 +181,5 @@ function danger_as_local() {
# Force danger to skip CI source GitLab and fallback to "local only git repo".
unset GITLAB_CI
# We need to base SHA to help danger determine the base commit for this shallow clone.
- bundle exec danger dry_run --fail-on-errors=true --verbose --base="${CI_MERGE_REQUEST_DIFF_BASE_SHA}" --head="${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}"
+ bundle exec danger dry_run --fail-on-errors=true --verbose --base="${CI_MERGE_REQUEST_DIFF_BASE_SHA}" --head="${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}" --dangerfile="${DANGER_DANGERFILE:-Dangerfile}"
}
--
GitLab