From 8cd292f5195be094d67096174e688504897663b7 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Mon, 6 Jan 2020 01:42:30 -0800
Subject: Directly refer to GitHub events

instead of unnecessarily defining env vars
---
 .github/workflows/macos.yml  | 8 ++------
 .github/workflows/mingw.yml  | 7 +++----
 .github/workflows/mjit.yml   | 8 ++------
 .github/workflows/ubuntu.yml | 8 ++------
 4 files changed, 9 insertions(+), 22 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 39d0391b7f..f68a448644 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -27,12 +27,8 @@ jobs:
         if: github.event_name == 'push'
       - name: Checkout a pull request
         run: |
-          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
-          git -C src reset --hard "$GITHUB_REV"
-        env:
-          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
-          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
-          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+          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
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
         if: github.event_name == 'pull_request'
       - run: ./src/tool/actions-commit-info.sh
         id: commit_info
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 9615c0007d..af48f85fb9 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -42,11 +42,10 @@ jobs:
           git clone --single-branch --shallow-since=yesterday https://github.com/ruby/ruby src
           git -C src reset --hard "$GITHUB_SHA"
         if: github.event_name == 'push'
-      # It's hard to propagate `env` to this workflow's shell environment to checkout PR. Using unstable actions/checkout as a workaround.
       - name: Checkout a pull request
-        uses: actions/checkout@v2
-        with:
-          path: src
+        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
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
         if: github.event_name == 'pull_request'
       - run: ./src/tool/actions-commit-info.sh
         shell: bash
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index 105639ef39..879b0c0cc7 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -29,12 +29,8 @@ jobs:
         if: github.event_name == 'push'
       - name: Checkout a pull request
         run: |
-          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
-          git -C src reset --hard "$GITHUB_REV"
-        env:
-          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
-          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
-          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+          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
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
         if: github.event_name == 'pull_request'
       - run: ./src/tool/actions-commit-info.sh
         id: commit_info
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 7669038f70..fbb23d11ee 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -60,12 +60,8 @@ jobs:
         if: github.event_name == 'push'
       - name: Checkout a pull request
         run: |
-          git clone --single-branch --shallow-since=yesterday "--branch=$GITHUB_BRANCH" "https://github.com/${GITHUB_REPO}" src
-          git -C src reset --hard "$GITHUB_REV"
-        env:
-          GITHUB_REV: ${{ github.event.pull_request.head.sha }}
-          GITHUB_BRANCH: ${{ github.event.pull_request.head.ref }}
-          GITHUB_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+          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
+          git -C src reset --hard ${{ github.event.pull_request.head.sha }}
         if: github.event_name == 'pull_request'
       - run: ./src/tool/actions-commit-info.sh
         id: commit_info
-- 
cgit v1.2.3