diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-31 12:10:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-31 12:10:26 +0300 |
commit | 26d2324ac136c7a28235789ff9a0b2974b5f7c7b (patch) | |
tree | f6a8cb8c0edf9225c3182ba115916f861bcc6357 /scripts/merge-simplecov | |
parent | 4603adb20ba7c5b84700fb0bf41b43f7b1a49f8c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/merge-simplecov')
-rwxr-xr-x | scripts/merge-simplecov | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index 7db12839382..8c816b8048f 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -2,9 +2,10 @@ # frozen_string_literal: true require_relative '../config/bundler_setup' -require_relative '../spec/simplecov_env' -SimpleCovEnv.configure_profile -SimpleCovEnv.configure_formatter +require_relative '../spec/simplecov_env_core' + +SimpleCovEnvCore.configure_profile +SimpleCovEnvCore.configure_formatter resultset_files = Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json')) exit(0) if resultset_files.empty? |