git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #825 from oauth2-proxy/test-reporter

Fix code coverage reporting on GitHub actions

commitf4c292b6c75d64675b21c75f1c41c5bb4388033b authorNick Meves <nick.meves@greenhouse.io> dateTue 13 Oct 2020, 17:16 (6 years ago) parentf705d2b132c2cb
3 files changed+7−7
compare with master
unifiedsplit
.github/workflows/ci.yaml+1−1 test.sh → .github/workflows/test.sh+5−6 CHANGELOG.md+1
.github/workflows/ci.yaml+1−1
@@ -45,7 +45,7 @@ jobs:
4545 env:
4646 CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
4747 run: |
48− ./test.sh
48+ ./.github/workflows/test.sh
4949
5050 docker:
5151 runs-on: ubuntu-18.04
test.sh → .github/workflows/test.shrenamed+5−6
@@ -2,8 +2,8 @@
22# manually exiting from script, because after-build needs to run always
33set +e
44
5−if [ -z $CC_TEST_REPORT_ID ]; then
6− echo "1. CC_TEST_REPORT_ID is unset, skipping"
5+if [ -z $CC_TEST_REPORTER_ID ]; then
6+ echo "1. CC_TEST_REPORTER_ID is unset, skipping"
77else
88 echo "1. Running before-build"
99 ./cc-test-reporter before-build
@@ -12,13 +12,12 @@ fi
1212echo "2. Running test"
1313make test
1414TEST_STATUS=$?
15−echo "TEST_STATUS: ${TEST_STATUS}"
1615
17−if [ -z $CC_TEST_REPORT_ID ]; then
18− echo "3. CC_TEST_REPORT_ID is unset, skipping"
16+if [ -z $CC_TEST_REPORTER_ID ]; then
17+ echo "3. CC_TEST_REPORTER_ID is unset, skipping"
1918else
2019 echo "3. Running after-build"
21− ./cc-test-reporter after-build --exit-code $TEST_STATUS -t gocov
20+ ./cc-test-reporter after-build --exit-code $TEST_STATUS -t gocov --prefix $(basename $(go list -m))
2221fi
2322
2423if [ "$TEST_STATUS" -ne 0 ]; then
CHANGELOG.md+1
@@ -25,6 +25,7 @@
2525
2626## Changes since v6.1.1
2727
28+- [#825](https://github.com/oauth2-proxy/oauth2-proxy/pull/825) Fix code coverage reporting on GitHub actions(@JoelSpeed)
2829- [#705](https://github.com/oauth2-proxy/oauth2-proxy/pull/705) Add generic Header injectors for upstream request and response headers (@JoelSpeed)
2930- [#753](https://github.com/oauth2-proxy/oauth2-proxy/pull/753) Pass resource parameter in login url (@codablock)
3031- [#789](https://github.com/oauth2-proxy/oauth2-proxy/pull/789) Add `--skip-auth-route` configuration option for `METHOD=pathRegex` based allowlists (@NickMeves)