Commit 98b2b872 authored by Thong Kuah's avatar Thong Kuah

Merge branch '349636-print-base-compare' into 'master'

Print which ref we're passing to undercoverage

See merge request gitlab-org/gitlab!77753
parents 0716b8a1 46e93b9a
...@@ -598,8 +598,10 @@ rspec:undercoverage: ...@@ -598,8 +598,10 @@ rspec:undercoverage:
else else
echo "Using \$CI_COMMIT_SHA ($CI_COMMIT_SHA) for this non-merge result pipeline."; echo "Using \$CI_COMMIT_SHA ($CI_COMMIT_SHA) for this non-merge result pipeline.";
fi; fi;
- UNDERCOVERAGE_COMPARE="${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$(git merge-base origin/master HEAD)}"
- echo "Undercoverage comparing with ${UNDERCOVERAGE_COMPARE}"
- if [ -f scripts/undercoverage ]; then - if [ -f scripts/undercoverage ]; then
run_timed_command "scripts/undercoverage"; run_timed_command "scripts/undercoverage ${UNDERCOVERAGE_COMPARE}";
fi; fi;
rspec:feature-flags: rspec:feature-flags:
......
#!/usr/bin/env bash #!/usr/bin/env bash
bundle exec undercover -c "${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$(git merge-base origin/master HEAD)}" bundle exec undercover -c "${1:-$(git merge-base origin/master HEAD)}"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment