update github-pull-request-creation.yml

tsubakimoto · Jul 18, 2023 · 2c098fd · 2c098fd
1 parent 9467da1
commit 2c098fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/github-pull-request-creation.yml b/.github/workflows/github-pull-request-creation.yml
@@ -9,6 +9,7 @@ on:
         type: string
 
 env:
+  BRANCH: ${{ inputs.branch-name }}
   TITLE: "PR from ${{ inputs.branch-name }}"
 
 jobs:
@@ -18,13 +19,13 @@ jobs:
       - name: Dump parameters
         run: |
           echo "**branch name**"
-          echo ${{ inputs.branch-name }}
+          echo "$BRANCH"
           echo "**title**"
           echo $TITLE
       - name: Create a pull request
         run: |
           gh pr create \
-            --base ${{ inputs.branch-name }} \
+            --base "$BRANCH" \
             --title "$TITLE" \
             --body ""
         env:

diff --git a/.github/workflows/github-repository-commit.yml b/.github/workflows/github-repository-commit.yml
@@ -14,12 +14,15 @@ jobs:
   commit-on-branch:
     name: Commit a new file
     runs-on: ubuntu-latest
+    outputs:
+      branch-name: ${{ steps.commit-step.outputs.branch-name }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Prepare a branch, and file
+        id: commit-step
         run: |
           echo -e "\n" >> README.md
           date >> README.md
@@ -30,11 +33,13 @@ jobs:
           git commit -m "Add date to README.md"
           git push --set-upstream origin $BRANCH
           git checkout main
+          echo "branch-name: $BRANCH"
+          echo "branch-name=$BRANCH" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   call-pull-request-workflow:
     name: Call pull request workflow
     needs: commit-on-branch
     uses: ./.github/workflows/github-pull-request-creation.yml
     with:
-      branch-name: $BRANCH
+      branch-name: ${{ needs.commit-on-branch.outputs.branch-name }}