Skip to content

chore(deps): update trunk-io/trunk-action action to v1.2.4 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gberenice merged 4 commits into from
Aug 13, 2025
Merged

chore(deps): update trunk-io/trunk-action action to v1.2.4 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15111aa
chore(deps): update trunk-io/trunk-action action to v1.2.4
renovate[bot] Jun 1, 2025
ccbc14f
fix: wait for checks and merge with admin
gberenice Jun 5, 2025
8f378ba
Merge branch 'master' into renovate/github-actions-auto-upgrade
westonplatter Jun 30, 2025
05be60d
Merge branch 'master' into renovate/github-actions-auto-upgrade
gberenice Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Trunk Check
uses: trunk-io/trunk-action@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4

conventional-title:
runs-on: ubuntu-latest
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/trunk-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,26 @@ jobs:

- name: Upgrade
id: trunk-upgrade
uses: trunk-io/trunk-action/upgrade@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
uses: trunk-io/trunk-action/upgrade@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
with:
github-token: ${{ steps.generate-token.outputs.token }}
reviewers: "@masterpointio/masterpoint-internal"
prefix: "chore: "
arguments: --base=master
# arguments: --base=${{ github.event.repository.default_branch }}

- name: Merge PR automatically
- name: Wait for checks to pass and merge
if: steps.trunk-upgrade.outputs.pull-request-number != ''
env:
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
PR_NUMBER: ${{ steps.trunk-upgrade.outputs.pull-request-number }}
run: |
gh pr merge "$PR_NUMBER" --squash --auto --delete-branch
echo "Waiting for all required status checks to pass on PR #$PR_NUMBER..."

while gh pr checks "$PR_NUMBER" --json statusCheckRollup | jq -e '.statusCheckRollup[] | select(.status != "COMPLETED" or .conclusion != "SUCCESS")'; do
echo "Checks are still running or failing. Retrying in 30 seconds..."
sleep 30
done

echo "All checks passed. Merging PR #$PR_NUMBER..."
gh pr merge "$PR_NUMBER" --squash --delete-branch --admin