diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 15:14:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 15:14:03 +0000 |
| commit | a75c69379b2cc15b8851aa61e874b06ea5856f83 (patch) | |
| tree | e3927c8a1b9ed1b35543cc3a10624e55b9fbb9dc /danger | |
| parent | 07d9675a80861fe84199e4002667f0bd57c160bf (diff) | |
| download | gitlab-ce-a75c69379b2cc15b8851aa61e874b06ea5856f83.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/Dangerfile-bundle_size | 33 | ||||
| -rw-r--r-- | danger/database/Dangerfile | 5 |
2 files changed, 3 insertions, 35 deletions
diff --git a/danger/Dangerfile-bundle_size b/danger/Dangerfile-bundle_size index 23ab726096e..122002c1a7b 100644 --- a/danger/Dangerfile-bundle_size +++ b/danger/Dangerfile-bundle_size @@ -1,38 +1,7 @@ # frozen_string_literal: true # This file isn't named "Dangerfile" so that it's not imported by default since it's only meant to be run in the `bundle-size-review` job. -analysis_result = "./bundle-size-review/analysis.json" -markdown_result = "./bundle-size-review/comparison.md" - -# Executing the webpack-entry-point-analyser -# We would like to do that in the CI file directly, -# but unfortunately the head_commit SHA is not available -# as a CI variable due to our merge into master simulation -analyze_cmd = [ - "webpack-entry-point-analyser", - "--from-file ./webpack-report/stats.json", - "--json #{analysis_result}", - " --sha #{gitlab&.head_commit}" -].join(" ") - -# execute analysis -`#{analyze_cmd}` - -# We are executing the comparison by comparing the start_sha -# to the current pipeline result. The start_sha is the commit -# from master that was merged into for the merged pipeline. -comparison_cmd = [ - "webpack-compare-reports", - "--job #{ENV["CI_JOB_ID"]}", - "--to-file #{analysis_result}", - "--html ./bundle-size-review/comparison.html", - "--markdown #{markdown_result}" -].join(" ") - -# execute comparison -`#{comparison_cmd}` - -comment = `cat #{markdown_result}` +comment = `cat ./bundle-size-review/comparison.md` unless comment.strip.empty? markdown(<<~MARKDOWN) diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile index 7b3a32358fe..df6ffab7c94 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -31,9 +31,8 @@ by removing the ~database label and re-running the [`danger-review` job](#{ENV[' 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. - +1. Kick off the `db:gitlabcom-database-testing` manual job. This job can also be used before + requesting review to test your migrations against production data. MSG DATABASE_APPROVED_LABEL = 'database::approved' |