diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /danger | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'danger')
-rw-r--r-- | danger/ci_config/Dangerfile | 3 | ||||
-rw-r--r-- | danger/database/Dangerfile | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/danger/ci_config/Dangerfile b/danger/ci_config/Dangerfile index 5022ccc1539..f29888d1ec8 100644 --- a/danger/ci_config/Dangerfile +++ b/danger/ci_config/Dangerfile @@ -9,6 +9,7 @@ def get_ci_config_files(files) end schema_path = 'app/assets/javascripts/editor/schema/ci.json' +schema_docs_path = 'https://docs.gitlab.com/ee/development/cicd/schema.html#write-specs' has_schema_update = all_changed_files.include?(schema_path) return if has_schema_update @@ -17,4 +18,4 @@ return if ci_config_files.empty? file_list = "- #{ci_config_files.map { |path| "`#{path}`" }.join("\n- ")}" -warn "This merge request changed CI config files but did not update the schema. Please consider updating [the schema](#{schema_path}) to reflect these changes:\n#{file_list}" +warn "This merge request changed CI config files but did not update the schema. Please consider updating [the schema](#{schema_path}) to reflect these changes:\n#{file_list}.\n\nRefer to the [docs](#{schema_docs_path}) for help on how to run and write specs for the CI schema." diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile index f94184263ad..7b3a32358fe 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -30,6 +30,12 @@ If you no longer require a database review, you can remove this suggestion by removing the ~database label and re-running the [`danger-review` job](#{ENV['CI_JOB_URL']}). MSG +DB_MIGRATION_TESTING_REQUIRED_MESSAGE = <<~MSG +1. If this is not a ~"Community contribution" or from a Fork, kick off the + `db:gitlabcom-database-testing` manual job. + +MSG + DATABASE_APPROVED_LABEL = 'database::approved' non_geo_db_schema_updated = !git.modified_files.grep(%r{\Adb/structure\.sql}).empty? @@ -58,9 +64,10 @@ if helper.mr_labels.include?('database') || db_paths_to_review.any? 'review from the [Database team](https://gitlab.com/groups/gl-database/-/group_members).' markdown(DB_MESSAGE) + markdown(DB_MIGRATION_TESTING_REQUIRED_MESSAGE) if non_geo_migration_created if db_paths_to_review.any? - markdown(DB_FILES_MESSAGE + helper.markdown_list(db_paths_to_review)) + markdown(DB_FILES_MESSAGE + helper.markdown_list(db_paths_to_review.to_set)) else markdown(DB_REMOVE_MESSAGE) end |