From c7a35261a8a34e992795b9e9ce15c9aea2f2bfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?= Date: Wed, 18 Nov 2020 18:37:30 -0300 Subject: [PATCH 1/2] Fix typo (it is 'refs/heads/' not 'refs/head') --- lib/codecov.rb | 2 +- test/test_codecov.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/codecov.rb b/lib/codecov.rb index 63006f6..e322585 100644 --- a/lib/codecov.rb +++ b/lib/codecov.rb @@ -192,7 +192,7 @@ def build_params(ci) when GITHUB # https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables params[:service] = 'github-actions' - params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/head/', '') + params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/heads/', '') # PR refs are in the format: refs/pull/7/merge for pull_request events params[:pr] = ENV['GITHUB_REF'].split('/')[2] unless ENV['GITHUB_HEAD_REF'].nil? || ENV['GITHUB_HEAD_REF'].empty? params[:slug] = ENV['GITHUB_REPOSITORY'] diff --git a/test/test_codecov.rb b/test/test_codecov.rb index 08ffa62..ec52eab 100644 --- a/test/test_codecov.rb +++ b/test/test_codecov.rb @@ -485,7 +485,7 @@ def test_github_push ENV['CI'] = 'true' ENV['GITHUB_ACTIONS'] = 'true' ENV['GITHUB_HEAD_REF'] = nil - ENV['GITHUB_REF'] = 'refs/head/master' + ENV['GITHUB_REF'] = 'refs/heads/master' ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo' ENV['GITHUB_RUN_ID'] = '1' ENV['GITHUB_SHA'] = 'c739768fcac68144a3a6d82305b9c4106934d31a' From 575145c62f98a07afe86f324562f103b2d412963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?= Date: Wed, 18 Nov 2020 20:09:28 -0300 Subject: [PATCH 2/2] Detect GITHUB_HEAD_REF='' as falsey --- lib/codecov.rb | 10 +++++++--- test/test_codecov.rb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/codecov.rb b/lib/codecov.rb index e322585..6acfa16 100644 --- a/lib/codecov.rb +++ b/lib/codecov.rb @@ -192,9 +192,13 @@ def build_params(ci) when GITHUB # https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables params[:service] = 'github-actions' - params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/heads/', '') - # PR refs are in the format: refs/pull/7/merge for pull_request events - params[:pr] = ENV['GITHUB_REF'].split('/')[2] unless ENV['GITHUB_HEAD_REF'].nil? || ENV['GITHUB_HEAD_REF'].empty? + if (ENV['GITHUB_HEAD_REF'] || '').empty? + params[:branch] = ENV['GITHUB_REF'].sub('refs/heads/', '') + else + params[:branch] = ENV['GITHUB_HEAD_REF'] + # PR refs are in the format: refs/pull/7/merge for pull_request events + params[:pr] = ENV['GITHUB_REF'].split('/')[2] + end params[:slug] = ENV['GITHUB_REPOSITORY'] params[:build] = ENV['GITHUB_RUN_ID'] params[:commit] = ENV['GITHUB_SHA'] diff --git a/test/test_codecov.rb b/test/test_codecov.rb index ec52eab..db74b8a 100644 --- a/test/test_codecov.rb +++ b/test/test_codecov.rb @@ -484,7 +484,7 @@ def test_github_pull_request def test_github_push ENV['CI'] = 'true' ENV['GITHUB_ACTIONS'] = 'true' - ENV['GITHUB_HEAD_REF'] = nil + ENV['GITHUB_HEAD_REF'] = '' ENV['GITHUB_REF'] = 'refs/heads/master' ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo' ENV['GITHUB_RUN_ID'] = '1'