File tree Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -10,15 +10,22 @@ jobs:
1010 - name : Find dependency PRs
1111 id : find_prs
1212 run : |
13- gh pr list --repo "alteryx/woodwork" --author "machineFL" --base main --state open --search "status:success review:required" --limit 1 --json url > dep_PRs_waiting_approval.json
13+ rm -f dep_PRs_waiting_approval.json
14+ gh pr list --repo "${{ github.repository }}" --author "machineFL" --base main --state open --search "status:success review:required" --limit 1 --json url > dep_PRs_waiting_approval.json
1415 echo ::set-output name=dep_pull_request_url::$(cat dep_PRs_waiting_approval.json | grep -Eo "(https)://[a-zA-Z0-9./?=_%:-]*")
1516 env :
1617 GITHUB_TOKEN : ${{ secrets.REPO_SCOPED_TOKEN }}
1718 - name : Approve dependency PRs and enable auto-merge
18- if : startsWith( ${{ steps.find_prs.outputs.dep_pull_request_url }}, "https://github.com/alteryx/woodwork/pull/" )
19- run : |
20- gh pr review --comment --body "auto approve" ${{ steps.find_prs.outputs.dep_pull_request_url }}
21- gh pr review --approve ${{ steps.find_prs.outputs.dep_pull_request_url }}
22- gh pr merge --auto --squash ${{ steps.find_prs.outputs.dep_pull_request_url }}
19+ id : approve_prs
20+ if : >-
21+ ${{
22+ steps.find_prs.outputs.dep_pull_request_url != '' &&
23+ contains( steps.find_prs.outputs.dep_pull_request_url, 'https://github.com/alteryx/woodwork/pull/')
24+ }}
25+ run : |
26+ echo ${{ steps.find_prs.outputs.dep_pull_request_url }}
27+ gh pr review --repo "${{ github.repository }}" --comment --body "auto approve" ${{ steps.find_prs.outputs.dep_pull_request_url }}
28+ gh pr review --repo "${{ github.repository }}" --approve ${{ steps.find_prs.outputs.dep_pull_request_url }}
29+ gh pr merge --repo "${{ github.repository }}" --auto --squash ${{ steps.find_prs.outputs.dep_pull_request_url }}
2330 env :
2431 GITHUB_TOKEN : ${{ secrets.AUTO_APPROVE_TOKEN }}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ Future Release
1111 * Documentation Changes
1212 * Updating contributing doc with Spark installat instructions (:pr: `1232 `)
1313 * Testing Changes
14- * Enable auto-merge for minimum and latest dependency merge requests (:pr: `1228 `, :pr: `1230 `)
14+ * Enable auto-merge for minimum and latest dependency merge requests (:pr: `1228 `, :pr: `1230 `, :pr: ` 1233 ` )
1515
1616 Thanks to the following people for contributing to this release:
1717 :user: `gsheni `, :user: `willsmithorg `
You can’t perform that action at this time.
0 commit comments