Skip to content

Commit 5829528

Browse files
chore(deps): update github-actions-auto-upgrade (#7)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [googleapis/release-please-action](https://redirect.github.com/googleapis/release-please-action) | action | minor | `v4.1.3` -> `v4.3.0` | | [trunk-io/trunk-action](https://redirect.github.com/trunk-io/trunk-action) | action | minor | `v1.1.19` -> `v1.2.4` | --- ### Release Notes <details> <summary>googleapis/release-please-action (googleapis/release-please-action)</summary> ### [`v4.3.0`](https://redirect.github.com/googleapis/release-please-action/releases/tag/v4.3.0) [Compare Source](https://redirect.github.com/googleapis/release-please-action/compare/v4.2.0...v4.3.0) ##### Features - **deps:** update release-please to 17.1.2 ([f07192c](https://redirect.github.com/googleapis/release-please-action/commit/f07192c046b10acd083f4665a3d8b6350526f9df)) ### [`v4.2.0`](https://redirect.github.com/googleapis/release-please-action/releases/tag/v4.2.0) [Compare Source](https://redirect.github.com/googleapis/release-please-action/compare/v4.1.5...v4.2.0) ##### Features - support for skip-labeling parameter for GitHub action ([#&#8203;1066](https://redirect.github.com/googleapis/release-please-action/issues/1066)) ([fb7f385](https://redirect.github.com/googleapis/release-please-action/commit/fb7f385da2046f35c544011bc27c9f809122ad2c)) ### [`v4.1.5`](https://redirect.github.com/googleapis/release-please-action/releases/tag/v4.1.5) [Compare Source](https://redirect.github.com/googleapis/release-please-action/compare/v4.1.4...v4.1.5) ##### Bug Fixes - **deps:** update release-please to 16.18.0 ([#&#8203;1083](https://redirect.github.com/googleapis/release-please-action/issues/1083)) ([aeb7f8d](https://redirect.github.com/googleapis/release-please-action/commit/aeb7f8d38402d856532f7c879373d8116956b1c8)) ### [`v4.1.4`](https://redirect.github.com/googleapis/release-please-action/releases/tag/v4.1.4) [Compare Source](https://redirect.github.com/googleapis/release-please-action/compare/v4.1.3...v4.1.4) ##### Bug Fixes - bump braces from 3.0.2 to 3.0.3 in the npm\_and\_yarn group ([#&#8203;1015](https://redirect.github.com/googleapis/release-please-action/issues/1015)) ([5ec1cbd](https://redirect.github.com/googleapis/release-please-action/commit/5ec1cbd9cb73c9d06637313bec5e3d6788e6a5f1)) - bump release-please from 16.12.0 to 16.13.0 ([#&#8203;1030](https://redirect.github.com/googleapis/release-please-action/issues/1030)) ([caa0464](https://redirect.github.com/googleapis/release-please-action/commit/caa04646d19fbb163bb853d276be1877fd092e90)) - bump release-please from 16.13.0 to 16.14.0 ([#&#8203;1032](https://redirect.github.com/googleapis/release-please-action/issues/1032)) ([b2a986c](https://redirect.github.com/googleapis/release-please-action/commit/b2a986c7e2f041e21005c546b2e03e9722e45bad)) - **deps:** update release-please to 16.14.1 ([#&#8203;1036](https://redirect.github.com/googleapis/release-please-action/issues/1036)) ([2942e51](https://redirect.github.com/googleapis/release-please-action/commit/2942e515c92f10850cc891e4900fb50eb62eba74)) </details> <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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- 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/github-action-trunk-upgrade). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45MS4xIiwidXBkYXRlZEluVmVyIjoiNDEuOTEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiYXV0by11cGdyYWRlIiwiZ2l0aHViLWFjdGlvbnMiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Veronika Gnilitska <[email protected]>
1 parent e9a89ec commit 5829528

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: Trunk Check
34-
uses: trunk-io/trunk-action@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
34+
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
3535
env:
3636
# NOTE: inject the GITHUB_TOKEN for the trunk managed tflint linter
3737
# https://github.com/terraform-linters/tflint/blob/master/docs/user-guide/plugins.md#avoiding-rate-limiting

.github/workflows/release-please.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
app_id: ${{ secrets.MP_BOT_APP_ID }}
2222
private_key: ${{ secrets.MP_BOT_APP_PRIVATE_KEY }}
2323

24-
- uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f #v4.1.3
24+
- uses: googleapis/release-please-action@c2a5a2bd6a758a0937f1ddb1e8950609867ed15c # v4.3.0
2525
with:
2626
token: ${{ steps.generate-token.outputs.token }}
2727
release-type: terraform-module

action.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ runs:
8282
8383
- name: Run Trunk Upgrade
8484
id: trunk-upgrade
85-
uses: trunk-io/trunk-action/upgrade@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
85+
uses: trunk-io/trunk-action/upgrade@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
8686
with:
8787
github-token: ${{ steps.github-token.outputs.token }}
8888
reviewers: ${{ inputs.reviewers }}
@@ -124,10 +124,8 @@ runs:
124124
echo "$1" | jq '[.[] | select(.state!="SUCCESS" or .bucket!="pass")] | length'
125125
}
126126
127-
approve_and_merge_pr() {
128-
local approval_message="$1"
129-
echo "🤖 Auto-approving and merging PR $REPO_URL/pull/$PR_NUMBER..."
130-
gh pr review "$PR_NUMBER" --approve --body "$approval_message"
127+
merge_pr() {
128+
echo "🤖 Auto-merging PR $REPO_URL/pull/$PR_NUMBER..."
131129
132130
# Retry merge up to 3 times to handle base branch updates
133131
local max_retries=3
@@ -169,8 +167,8 @@ runs:
169167
# Handle case with no required checks - can merge immediately
170168
if [ "$REQUIRED_COUNT" -eq 0 ]; then
171169
echo "✅ No required status checks configured. PR is ready to merge."
172-
echo "Proceeding with auto-approval and merge..."
173-
if approve_and_merge_pr "Auto-approved by trunk upgrade action (no required status checks)"; then
170+
echo "Proceeding with auto-merge..."
171+
if merge_pr; then
174172
exit 0
175173
else
176174
echo "❌ Failed to merge PR. Exiting with error."
@@ -208,7 +206,7 @@ runs:
208206
# Check if all required checks have passed
209207
PENDING_COUNT=$(count_pending_checks "$CURRENT_CHECKS")
210208
if [ "$PENDING_COUNT" -eq 0 ]; then
211-
if approve_and_merge_pr "Auto-approved by trunk upgrade action (all required checks passed)"; then
209+
if merge_pr; then
212210
break
213211
else
214212
echo "❌ Failed to merge PR after all checks passed. Exiting with error."

0 commit comments

Comments
 (0)