summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJohn Lightsey <john@nixnuts.net>2020-08-01 11:43:49 -0500
committerNicolas R <nicolas@atoomic.org>2020-08-01 16:36:12 -0600
commit9435e772f23666ac6f7cf87e8d698cb5bab6a571 (patch)
tree4e71e1f78fd3d2e0ef28f74732ba688407f36e8f /.github
parentad9dfdb7a438018fb4b5978c20714c0e11bb3def (diff)
downloadperl-9435e772f23666ac6f7cf87e8d698cb5bab6a571.tar.gz
Fix github action testing of pull requests on cygwin
The GITHUB_REF head on the remote doesn't reliably contain GITHUB_SHA when testing pull requests. These PR merge SHAs are likely transient. Checkout whatever the fetch retrieved from GITHUB_REF instead.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/testsuite.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index b1e5039978..c3697636d1 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -386,7 +386,7 @@ jobs:
shell: cmd
run: |
path %GITHUB_WORKSPACE%\cygwin\bin;%GITHUB_WORKSPACE%\cygwin\usr\bin
- sh -c "mkdir -p ~; cd ~; echo \"$GITHUB_REPOSITORY\"; git clone -qn \"https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY\" work ; cd work ; if [ \"$GITHUB_EVENT_NAME\" = pull_request ] ; then git fetch origin \"$GITHUB_REF\" ; fi ; git checkout \"$GITHUB_SHA\""
+ sh -c "mkdir -p ~; cd ~; echo \"$GITHUB_REPOSITORY\"; git clone -qn \"https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY\" work ; cd work ; if [ \"$GITHUB_EVENT_NAME\" = pull_request ] ; then git fetch origin \"$GITHUB_REF\" && git checkout FETCH_HEAD ; else git checkout \"$GITHUB_SHA\" ; fi"
- name: Configure
shell: cmd
run: |