diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index f1261fe36..f257e30a0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -8,7 +8,7 @@ on: jobs: build: concurrency: - group: ${{ github.head_ref }} + group: ${{ github.ref }} cancel-in-progress: true runs-on: ubuntu-20.04 @@ -114,7 +114,7 @@ jobs: needs: [build] runs-on: ubuntu-20.04 - if: ${{ github.event_name == 'push' && github.base_ref == 'main' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} steps: - name: Download Documentation diff --git a/script/actions_utils/coverage.sh b/script/actions_utils/coverage.sh index 9fbd08376..216e31d87 100755 --- a/script/actions_utils/coverage.sh +++ b/script/actions_utils/coverage.sh @@ -6,7 +6,12 @@ set +e CURR_DIR=`dirname $0` # Run diff-coverage -BB="origin/$1" make coverage | tee diff-coverage.txt +if [[ "$1" == "" ]]; then + BB="origin/main" +else + BB="origin/$1" +fi +make coverage | tee diff-coverage.txt # Get exit code without closing the script TEST_EXIT_CODE="$?"