PR以外のトリガーの場合でも特別なパラメータなしに動作するようにする (#466)

massongit · github-actions[bot] · web-flow · commit 57d80925e166 · 2022-11-26T11:27:32.000Z
* PR以外のトリガーの場合でも特別な引数なしに動作するようにする * README修正 (#467) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add debug * Use github.ref_name * description修正 * Revert "Add debug" This reverts commit 014863e * HEAD_REFを設定する処理追加 * Add debug * Revert "Add debug" This reverts commit 481eaf2. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
diff --git a/.github/workflows/format-json-yml.yml b/.github/workflows/format-json-yml.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: dev-hato/actions-format-json-yml@v0.0.24
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/update-gitleaks.yml b/.github/workflows/update-gitleaks.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: actions/setup-node@v3.5.1
         with:
           cache: npm
diff --git a/.github/workflows/update-package.yml b/.github/workflows/update-package.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: actions/setup-node@v3.5.1
         with:
           cache: npm
@@ -34,7 +34,6 @@ jobs:
           branch-name-prefix: fix-package
           pr-title-prefix: package.json, package-lock.json修正
           pr-description-prefix: package.jsonやpackage-lock.jsonを修正しました。
-          repo-name: ${{ github.event.pull_request.head.repo.full_name }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: actions/setup-node@v3.5.1
         with:
           cache: npm
@@ -31,7 +31,7 @@ jobs:
         id: get_inputs_markdown
         uses: actions/github-script@v6.3.3
         env:
-          HEAD_REF: ${{github.event.pull_request.head.ref}}
+          HEAD_REF: ${{github.event.pull_request.head.ref || github.head_ref}}
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           result-encoding: string
@@ -47,7 +47,6 @@ jobs:
           branch-name-prefix: fix-readme
           pr-title-prefix: README修正
           pr-description-prefix: READMEを修正しました。
-          repo-name: ${{ github.event.pull_request.head.repo.full_name }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
diff --git a/README.md b/README.md
@@ -23,12 +23,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - run: hoge fmt # FIXME フォーマッタを走らせる
       - uses: dev-hato/actions-diff-pr-management@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
-          repo-name: ${{ github.event.pull_request.head.repo.full_name }}
 ```
 
 ## 例
@@ -41,11 +40,9 @@ jobs:
 | 引数名 | 説明 | 必須 |
 |:---:|:---:|:---:|
 | github-token | GitHubのトークン。 | O |
-| repo-name | リポジトリ名。 `pull_request` 以外のトリガーも設定している場合はリポジトリ名を決め打ちで入力。 | O |
 | branch-name-prefix | branch名の接頭語。 |  |
 | pr-title-prefix | PRのタイトルの接頭語。 |  |
 | pr-description-prefix | 本文の接頭語。 |  |
-| base-branch | ベースブランチ。 `pull_request` 以外のトリガーの場合は決め打ちで入力。 |  |
 
 ## 開発
 
diff --git a/README.template.md b/README.template.md
@@ -23,12 +23,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - run: hoge fmt # FIXME フォーマッタを走らせる
       - uses: dev-hato/actions-diff-pr-management@v1
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
-          repo-name: ${{ github.event.pull_request.head.repo.full_name }}
 ```
 
 ## 例
diff --git a/action.yml b/action.yml
@@ -5,9 +5,6 @@ inputs:
   github-token: # id of input
     description: 'GitHubのトークン。'
     required: true
-  repo-name:
-    description: 'リポジトリ名。 `pull_request` 以外のトリガーも設定している場合はリポジトリ名を決め打ちで入力。'
-    required: true
   branch-name-prefix:
     description: 'branch名の接頭語。'
     required: true
@@ -20,10 +17,6 @@ inputs:
     description: '本文の接頭語。'
     required: true
     default: ""
-  base-branch:
-    description: 'ベースブランチ。 `pull_request` 以外のトリガーの場合は決め打ちで入力。'
-    required: false
-    default: ""
 runs:
   using: "composite"
   steps:
@@ -36,45 +29,30 @@ runs:
     # 差分があったときは、コミットを作りpushする
     - name: Push
       env:
-        HEAD_REF: ${{github.event.pull_request.head.ref}}
+        HEAD_REF: ${{github.event.pull_request.head.ref || github.ref_name}}
         PR_TITLE_PREFIX: ${{inputs.pr-title-prefix}}
         AUTHOR: ${{github.actor}}
         GITHUB_TOKEN: ${{inputs.github-token}}
         REPOSITORY: ${{github.repository}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
-        BASE_BRANCH: ${{inputs.base-branch}}
-      if: inputs.repo-name == github.repository && steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+      if: steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
       run: ${{ github.action_path }}/scripts/action/push.sh
       shell: bash
     - name: Set org name
       uses: actions/github-script@v6.3.3
-      if: inputs.repo-name == github.repository && (github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+      if: github.event_name == 'pull_request' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       id: set_org_name
       with:
         github-token: ${{inputs.github-token}}
         result-encoding: string
         script: |
           const script = require('${{ github.action_path }}/scripts/action/set_org_name.js')
           return script()
-    - name: Get HEAD_REF
-      uses: actions/github-script@v6.3.3
-      env:
-        HEAD_REF: ${{github.event.pull_request.head.ref}}
-        BASE_BRANCH: ${{inputs.base-branch}}
-      if: inputs.repo-name == github.repository
-      id: get_head_ref
-      with:
-        github-token: ${{inputs.github-token}}
-        result-encoding: string
-        script: |
-          const script = require('${{ github.action_path }}/scripts/action/get_head_ref.js')
-          return script()
     - name: Get PullRequests
       uses: actions/github-script@v6.3.3
-      if: inputs.repo-name == github.repository && steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+      if: steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
       id: get_pull_requests
       env:
-        HEAD_REF: ${{steps.get_head_ref.outputs.result}}
         ORG_NAME: ${{steps.set_org_name.outputs.result}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
       with:
@@ -85,10 +63,9 @@ runs:
     # pushしたブランチでPRを作る
     - name: Create PullRequest
       uses: actions/github-script@v6.3.3
-      if: inputs.repo-name == github.repository && steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+      if: steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
       id: create_pull_request
       env:
-        HEAD_REF: ${{steps.get_head_ref.outputs.result}}
         ORG_NAME: ${{steps.set_org_name.outputs.result}}
         PR_DESCRIPTION_PREFIX: ${{inputs.pr-description-prefix}}
         PR_NUMBER: ${{github.event.pull_request.number}}
@@ -101,7 +78,7 @@ runs:
           return await script({github, context})
     - name: Assign a user
       uses: actions/github-script@v6.3.3
-      if: inputs.repo-name == github.repository && steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 && github.event_name == 'pull_request' && github.event.action != 'closed' && github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'renovate[bot]'
+      if: steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 && github.event_name == 'pull_request' && github.event.action != 'closed' && github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'renovate[bot]'
       env:
         PR_NUMBER: ${{steps.create_pull_request.outputs.result}}
         ASSIGN_USER: ${{github.event.pull_request.user.login}}
@@ -113,9 +90,8 @@ runs:
     # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる
     - name: Close PullRequest
       uses: actions/github-script@v6.3.3
-      if: inputs.repo-name == github.repository && ((github.event_name == 'pull_request' && (github.event.action == 'closed' || steps.diff.outputs.result == '')) || ((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && steps.diff.outputs.result == ''))
+      if: (github.event_name == 'pull_request' && (github.event.action == 'closed' || steps.diff.outputs.result == '')) || ((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && steps.diff.outputs.result == '')
       env:
-        HEAD_REF: ${{steps.get_head_ref.outputs.result}}
         ORG_NAME: ${{steps.set_org_name.outputs.result}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
       with:
diff --git a/scripts/action/create_pull_request.js b/scripts/action/create_pull_request.js
@@ -12,29 +12,42 @@ module.exports = async ({ github, context }) => {
   let title = PR_TITLE_PREFIX
   let body = process.env.PR_DESCRIPTION_PREFIX
 
+  body += `本PR ( \`${head}\` ) をマージすると差分が次のPRに反映されます。\n`
+  body += '* '
+
+  if (PR_NUMBER !== '') {
+    body += `#${PR_NUMBER} ( `
+  }
+
+  body += `\`${HEAD_REF}\``
+
+  if (PR_NUMBER !== '') {
+    body += ' )'
+  }
+
+  body += '\n'
+  body += '```mermaid\n'
+  body += `%%{init: {'gitGraph': {'mainBranchName': '${HEAD_REF}'}}}%%\n`
+  body += 'gitGraph\n'
+
+  for (let i = 0; i < 2; i++) {
+    body += '  commit\n'
+  }
+
+  body += `  branch ${head}\n`
+  body += `  checkout ${head}\n`
+  let commit = PR_TITLE_PREFIX
+
+  if (commit.length > 6) {
+    commit = commit.substring(0, 6) + '......'
+  }
+
+  body += `  commit id: "${commit}"\n`
+  body += `  checkout ${HEAD_REF}\n`
+  body += `  merge ${head}\n`
+  body += '```'
+
   if (PR_NUMBER !== '') {
-    body += `本PR ( \`${head}\` ) をマージすると差分が次のPRに反映されます。\n`
-    body += `* #${PR_NUMBER} ( \`${HEAD_REF}\` )\n`
-    body += '```mermaid\n'
-    body += `%%{init: {'gitGraph': {'mainBranchName': '${HEAD_REF}'}}}%%\n`
-    body += 'gitGraph\n'
-
-    for (let i = 0; i < 2; i++) {
-      body += '  commit\n'
-    }
-
-    body += `  branch ${head}\n`
-    body += `  checkout ${head}\n`
-    let commit = PR_TITLE_PREFIX
-
-    if (commit.length > 6) {
-      commit = commit.substring(0, 6) + '......'
-    }
-
-    body += `  commit id: "${commit}"\n`
-    body += `  checkout ${HEAD_REF}\n`
-    body += `  merge ${head}\n`
-    body += '```'
     title += ' #' + PR_NUMBER
   }
 
diff --git a/scripts/action/get_head_ref.js b/scripts/action/get_head_ref.js
diff --git a/scripts/action/push.sh b/scripts/action/push.sh
@@ -1,18 +1,12 @@
 #!/usr/bin/env bash
 
+echo "HEAD_REF=${HEAD_REF}" >>"${GITHUB_ENV}"
 git config user.name "github-actions[bot]"
 EMAIL="41898282+github-actions[bot]@users.noreply.github.com"
 git config user.email "${EMAIL}"
 git commit -m "${PR_TITLE_PREFIX}"
 REPO_URL="https://"
 REPO_URL+="${AUTHOR}:${GITHUB_TOKEN}@github.com/"
 REPO_URL+="${REPOSITORY}.git"
-GITHUB_HEAD="HEAD:refs/heads/${BRANCH_NAME_PREFIX}"
-
-if [ "${HEAD_REF}" != "" ]; then
-  GITHUB_HEAD+="-${HEAD_REF}"
-elif [ "${BASE_BRANCH}" != "" ]; then
-  GITHUB_HEAD+="-${BASE_BRANCH}"
-fi
-
+GITHUB_HEAD="HEAD:refs/heads/${BRANCH_NAME_PREFIX}-${HEAD_REF}"
 git push -f "${REPO_URL}" "${GITHUB_HEAD}"
