情報をスクリプト内の変数から取得する (#1488)

* Organization名取得をスクリプト内の変数を参照する形で行う

* 変数取得をスクリプト内の変数を参照する形で行う

Author: massongit

action.yml

@@ -46,31 +46,18 @@ runs:
     - name: Push
       env:
         PR_TITLE_PREFIX: ${{inputs.pr-title-prefix}}
-        AUTHOR: ${{github.actor}}
         TOKEN: ${{inputs.github-token}}
-        REPOSITORY: ${{github.repository}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
         NO_VERIFY: ${{inputs.no-verify}}
       if: steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch')
       working-directory: ${{inputs.working-directory}}
       run: ${{ github.action_path }}/scripts/action/push.sh
       shell: bash
-    - name: Set org name
-      uses: actions/github-script@v7.0.1
-      if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_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 PullRequests
       uses: actions/github-script@v7.0.1
       if: steps.diff.outputs.result != '' && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch')
       id: get_pull_requests
       env:
-        ORG_NAME: ${{steps.set_org_name.outputs.result}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
       with:
         github-token: ${{inputs.github-token}}
@@ -83,9 +70,7 @@ runs:
       if: steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 && ((github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch')
       id: create_pull_request
       env:
-        ORG_NAME: ${{steps.set_org_name.outputs.result}}
         PR_DESCRIPTION_PREFIX: ${{inputs.pr-description-prefix}}
-        PR_NUMBER: ${{github.event.pull_request.number}}
         PR_TITLE_PREFIX: ${{inputs.pr-title-prefix}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
       with:
@@ -98,7 +83,6 @@ runs:
       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}}
       with:
         github-token: ${{inputs.github-token}}
         script: |
@@ -109,7 +93,6 @@ runs:
       uses: actions/github-script@v7.0.1
       if: (github.event_name == 'pull_request' && (github.event.action == 'closed' || steps.diff.outputs.result == '')) || ((github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch') && steps.diff.outputs.result == '')
       env:
-        ORG_NAME: ${{steps.set_org_name.outputs.result}}
         BRANCH_NAME_PREFIX: ${{inputs.branch-name-prefix}}
       with:
         github-token: ${{inputs.github-token}}

scripts/action/assign_a_user.js

@@ -3,7 +3,7 @@ module.exports = async ({ github, context }) => {
     owner: context.repo.owner,
     repo: context.repo.repo,
     issue_number: process.env.PR_NUMBER,
-    assignees: [process.env.ASSIGN_USER]
+    assignees: [context.actor]
   }
   console.log('call issues.addAssignees:')
   console.log(issuesAddAssigneesParams)

scripts/action/close_pull_request.js

@@ -11,7 +11,7 @@ module.exports = async ({ github, context }) => {
     repo: context.repo.repo
   }
   const pullsListParams = {
-    head: process.env.ORG_NAME + ':' + headName,
+    head: context.repo.owner + ':' + headName,
     state: 'open',
     ...commonParams
   }

scripts/action/create_pull_request.js

@@ -1,7 +1,7 @@
 module.exports = async ({ github, context }) => {
   const HEAD_REF = process.env.HEAD_REF
   const escapedHeadRef = HEAD_REF.replaceAll('#', '')
-  const PR_NUMBER = process.env.PR_NUMBER
+  const PR_NUMBER = context.payload.number
   const PR_TITLE_PREFIX = process.env.PR_TITLE_PREFIX
   let head = process.env.BRANCH_NAME_PREFIX
 
@@ -10,7 +10,7 @@ module.exports = async ({ github, context }) => {
   }
 
   const escapedHead = head.replaceAll('#', '')
-  const headWithRepo = process.env.ORG_NAME + ':' + head
+  const headWithRepo = context.repo.owner + ':' + head
   let title = PR_TITLE_PREFIX
   let body = process.env.PR_DESCRIPTION_PREFIX
 

scripts/action/get_pull_requests.js

@@ -1,6 +1,6 @@
 module.exports = async ({ github, context }) => {
   const HEAD_REF = process.env.HEAD_REF
-  let head = process.env.ORG_NAME + ':' + process.env.BRANCH_NAME_PREFIX
+  let head = context.repo.owner + ':' + process.env.BRANCH_NAME_PREFIX
 
   if (HEAD_REF !== '') {
     head += '-' + HEAD_REF

scripts/action/push.sh

@@ -12,8 +12,8 @@ fi
 GIT_COMMIT_COMMAND="$GIT_COMMIT_COMMAND -m \"${PR_TITLE_PREFIX}\""
 eval "$GIT_COMMIT_COMMAND"
 REPO_URL="https://"
-REPO_URL+="${AUTHOR}:${TOKEN}@github.com/"
-REPO_URL+="${REPOSITORY}.git"
+REPO_URL+="${GITHUB_ACTOR}:${TOKEN}@github.com/"
+REPO_URL+="${GITHUB_REPOSITORY}.git"
 GITHUB_HEAD="HEAD:refs/heads/${BRANCH_NAME_PREFIX}-${HEAD_REF}"
 GIT_PUSH_COMMAND="git push"