Skip to content

Commit dad4989

Browse files
renovate[bot]gberenicewestonplatter
authored
chore(deps): update trunk-io/trunk-action action to v1.2.4 (#62)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [trunk-io/trunk-action](https://redirect.github.com/trunk-io/trunk-action) | action | minor | `v1.1.19` -> `v1.2.4` | --- ### Release Notes <details> <summary>trunk-io/trunk-action (trunk-io/trunk-action)</summary> ### [`v1.2.4`](https://redirect.github.com/trunk-io/trunk-action/releases/tag/v1.2.4) [Compare Source](https://redirect.github.com/trunk-io/trunk-action/compare/v1.2.3...v1.2.4) ##### What's Changed - Add `sign-commits` input to allow commit signing ([#&#8203;263](https://redirect.github.com/trunk-io/trunk-action/issues/263)) **Full Changelog**: trunk-io/trunk-action@v1.2.3...v1.2.4 ### [`v1.2.3`](https://redirect.github.com/trunk-io/trunk-action/releases/tag/v1.2.3) [Compare Source](https://redirect.github.com/trunk-io/trunk-action/compare/v1.2.2...v1.2.3) ##### What's Changed - Update deprecation comment copy ([#&#8203;280](https://redirect.github.com/trunk-io/trunk-action/issues/280)) For more information, see the [migration guide](https://docs.trunk.io/code-quality/setup-and-installation/prevent-new-issues/migration-guide). **Full Changelog**: trunk-io/trunk-action@v1.2.2...v1.2.3 ### [`v1.2.2`](https://redirect.github.com/trunk-io/trunk-action/releases/tag/v1.2.2) [Compare Source](https://redirect.github.com/trunk-io/trunk-action/compare/v1.2.1...v1.2.2) ##### What's Changed - Only posts deprecation comment when checking PRs ([#&#8203;279](https://redirect.github.com/trunk-io/trunk-action/issues/279)) For more information, see the [migration guide](https://docs.trunk.io/code-quality/setup-and-installation/prevent-new-issues/migration-guide). **Full Changelog**: trunk-io/trunk-action@v1.2.1...v1.2.2 ### [`v1.2.1`](https://redirect.github.com/trunk-io/trunk-action/releases/tag/v1.2.1) [Compare Source](https://redirect.github.com/trunk-io/trunk-action/compare/v1.2.0...v1.2.1) ##### What's Changed - Fixes token issue when posting deprecation comment ([#&#8203;278](https://redirect.github.com/trunk-io/trunk-action/issues/278)) For more information, see the [migration guide](https://docs.trunk.io/code-quality/setup-and-installation/prevent-new-issues/migration-guide). **Full Changelog**: trunk-io/trunk-action@v1.2.0...v1.2.1 ### [`v1.2.0`](https://redirect.github.com/trunk-io/trunk-action/releases/tag/v1.2.0) [Compare Source](https://redirect.github.com/trunk-io/trunk-action/compare/v1.1.19...v1.2.0) ##### What's Changed - Add deprecation notice for check uploads ([#&#8203;276](https://redirect.github.com/trunk-io/trunk-action/issues/276)) - Add deprecation notice for check on PRs ([#&#8203;277](https://redirect.github.com/trunk-io/trunk-action/issues/277)) For more information, see the [migration guide](https://docs.trunk.io/code-quality/setup-and-installation/prevent-new-issues/migration-guide). **Full Changelog**: trunk-io/trunk-action@v1.1.19...v1.2.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 9am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/masterpointio/masterpoint.io). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC40MC4zIiwidXBkYXRlZEluVmVyIjoiNDAuNDAuMyIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJhdXRvLXVwZ3JhZGUiLCJnaXRodWItYWN0aW9ucyJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Veronika Gnilitska <[email protected]> Co-authored-by: Weston Platter <[email protected]> Co-authored-by: Veronika Gnilitska <[email protected]>
1 parent 0427d28 commit dad4989

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Check out Git repository
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
- name: Trunk Check
22-
uses: trunk-io/trunk-action@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
22+
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
2323

2424
conventional-title:
2525
runs-on: ubuntu-latest

.github/workflows/trunk-upgrade.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,26 @@ jobs:
2828

2929
- name: Upgrade
3030
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
3232
with:
3333
github-token: ${{ steps.generate-token.outputs.token }}
3434
reviewers: "@masterpointio/masterpoint-internal"
3535
prefix: "chore: "
36+
arguments: --base=master
37+
# arguments: --base=${{ github.event.repository.default_branch }}
3638

37-
- name: Merge PR automatically
39+
- name: Wait for checks to pass and merge
3840
if: steps.trunk-upgrade.outputs.pull-request-number != ''
3941
env:
40-
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
42+
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
4143
PR_NUMBER: ${{ steps.trunk-upgrade.outputs.pull-request-number }}
4244
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

0 commit comments

Comments
 (0)