diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-21 10:44:18 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-21 12:46:49 +0200 |
| commit | 7a0f4d3c905cc92880697deac365a6c596fd55a8 (patch) | |
| tree | 7bdd5e0102d974f1920f4925180cc074d59dd504 /scripts | |
| parent | 8e5e668e1a0844ebafbfc8081d9f71a030feb1d6 (diff) | |
| download | gitlab-ce-7a0f4d3c905cc92880697deac365a6c596fd55a8.tar.gz | |
Introduce SimpleCovEnv singleton helper and use it
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/merge-simplecov | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index ab15b43bd0f..65f93f8830b 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -1,6 +1,7 @@ #!/usr/bin/env ruby -require 'simplecov' +require_relative '../spec/simplecov_env' +SimpleCovEnv.configure_profile module SimpleCov module ResultMerger @@ -26,10 +27,4 @@ module SimpleCov end end -# Ignore CI environment -ENV['CI'] = nil -ENV['CI_BUILD_NAME'] = nil - -require_relative '../spec/simplecov_env' - SimpleCov::ResultMerger.merged_result.format! |