diff --git a/.github/workflows/dispatch-actions.yml b/.github/workflows/dispatch-actions.yml index 06d4401..b54b9e6 100644 --- a/.github/workflows/dispatch-actions.yml +++ b/.github/workflows/dispatch-actions.yml @@ -1,4 +1,4 @@ -name: Dispatch +name: Submodule PR on: push: branches: [develop] @@ -12,16 +12,28 @@ jobs: OWNER: 'CanDIG' steps: - name: Check out repository code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + - name: get PR data + uses: actions/github-script@v7 + id: get_pr_data + with: + script: | + return ( + await github.rest.repos.listPullRequestsAssociatedWithCommit({ + commit_sha: context.sha, + owner: context.repo.owner, + repo: context.repo.repo, + }) + ).data[0]; - name: Create PR in CanDIGv2 id: make_pr - uses: jman005/github-action-pr-expanded@v0 + uses: CanDIG/github-action-pr-expanded@v4 with: github_token: ${{ secrets.SUBMODULE_PR }} parent_repository: ${{ env.PARENT_REPOSITORY }} checkout_branch: ${{ env.CHECKOUT_BRANCH}} pr_against_branch: ${{ env.PR_AGAINST_BRANCH }} - pr_description: "PR triggered by update to stable branch on ${{ github.repository }}. Commit hash: ${{ github.sha }}" + pr_title: '${{ github.repository }} merging: ${{ fromJson(steps.get_pr_data.outputs.result).title }}' + pr_description: "PR triggered by update to develop branch on ${{ github.repository }}. Commit hash: `${{ github.sha }}`. PR link: [#${{ fromJson(steps.get_pr_data.outputs.result).number }}](https://github.com/${{ github.repository }}/pull/${{ fromJson(steps.get_pr_data.outputs.result).number }})" owner: ${{ env.OWNER }} submodule_path: lib// - label: Submodule update \ No newline at end of file