File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 19
19
- name : Check out Git repository
20
20
uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21
21
- name : Trunk Check
22
- uses : trunk-io/trunk-action@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
22
+ uses : trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
23
23
24
24
conventional-title :
25
25
runs-on : ubuntu-latest
Original file line number Diff line number Diff line change @@ -28,16 +28,26 @@ jobs:
28
28
29
29
- name : Upgrade
30
30
id : trunk-upgrade
31
- uses : trunk-io/trunk-action/upgrade@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
31
+ uses : trunk-io/trunk-action/upgrade@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
32
32
with :
33
33
github-token : ${{ steps.generate-token.outputs.token }}
34
34
reviewers : " @masterpointio/masterpoint-internal"
35
35
prefix : " chore: "
36
+ arguments : --base=master
37
+ # arguments: --base=${{ github.event.repository.default_branch }}
36
38
37
- - name : Merge PR automatically
39
+ - name : Wait for checks to pass and merge
38
40
if : steps.trunk-upgrade.outputs.pull-request-number != ''
39
41
env :
40
- GITHUB_TOKEN : ${{ steps.generate-token.outputs.token }}
42
+ GH_TOKEN : ${{ steps.generate-token.outputs.token }}
41
43
PR_NUMBER : ${{ steps.trunk-upgrade.outputs.pull-request-number }}
42
44
run : |
43
- gh pr merge "$PR_NUMBER" --squash --auto --delete-branch
45
+ echo "Waiting for all required status checks to pass on PR #$PR_NUMBER..."
46
+
47
+ while gh pr checks "$PR_NUMBER" --json statusCheckRollup | jq -e '.statusCheckRollup[] | select(.status != "COMPLETED" or .conclusion != "SUCCESS")'; do
48
+ echo "Checks are still running or failing. Retrying in 30 seconds..."
49
+ sleep 30
50
+ done
51
+
52
+ echo "All checks passed. Merging PR #$PR_NUMBER..."
53
+ gh pr merge "$PR_NUMBER" --squash --delete-branch --admin
You can’t perform that action at this time.
0 commit comments