diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /scripts/merge-simplecov | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'scripts/merge-simplecov')
| -rwxr-xr-x | scripts/merge-simplecov | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index 32a0cd86f82..24be731549b 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -5,4 +5,7 @@ require_relative '../spec/simplecov_env' SimpleCovEnv.configure_profile SimpleCovEnv.configure_formatter -SimpleCov.collate Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json')) +resultset_files = Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json')) +exit(0) if resultset_files.empty? + +SimpleCov.collate(resultset_files) |