diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /scripts/merge-reports | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
| download | gitlab-ce-7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'scripts/merge-reports')
| -rwxr-xr-x | scripts/merge-reports | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/merge-reports b/scripts/merge-reports index a1164495f2f..43374d134d4 100755 --- a/scripts/merge-reports +++ b/scripts/merge-reports @@ -14,6 +14,8 @@ main_report = JSON.parse(File.read(main_report_file)) new_report = main_report.dup ARGV.each do |report_file| + next unless File.exist?(report_file) + report = JSON.parse(File.read(report_file)) # Remove existing values |