Add branch option to checkout on push

6 files changed, 9 insertions, 7 deletions

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 0918ddbb22..b8360d4523 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -44,10 +44,10 @@ jobs:
       # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard ${{ github.sha }}
         if: github.event_name == 'push'
-        shell: cmd
+        shell: bash
       - name: Checkout a pull request
         run: |
           git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5cbcd445aa..d86f03845f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -22,7 +22,7 @@ jobs:
       # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard "$GITHUB_SHA"
         if: github.event_name == 'push'
       - name: Checkout a pull request
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 61b607c90c..cea26a51c2 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -39,9 +39,10 @@ jobs:
       # Not using official actions/checkout@v2 because it's unstable.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard "$GITHUB_SHA"
         if: github.event_name == 'push'
+        shell: bash
       - name: Checkout a pull request
         run: |
           git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index 540dbb7354..e7730506d2 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -24,7 +24,7 @@ jobs:
       # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard "$GITHUB_SHA"
         if: github.event_name == 'push'
       - name: Checkout a pull request
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 66d7065d63..7a40c24acf 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -55,7 +55,7 @@ jobs:
       # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard "$GITHUB_SHA"
         if: github.event_name == 'push'
       - name: Checkout a pull request
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3a4de23245..82cca9353b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -40,9 +40,10 @@ jobs:
       # Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
       - name: Checkout ruby
         run: |
-          git clone --single-branch --shallow-since=yesterday https://github.com/${{ github.repository }} src
+          git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
           git -C src reset --hard ${{ github.sha }}
         if: github.event_name == 'push'
+        shell: bash
       - name: Checkout a pull request
         run: |
           git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src