From 15111aa0e255b2e9f5e0a5749175cdff3cc310fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 12:11:40 +0000
Subject: [PATCH 1/2] chore(deps): update trunk-io/trunk-action action to
 v1.2.4

---
 .github/workflows/lint.yaml          | 2 +-
 .github/workflows/trunk-upgrade.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 2bbb389d..13a2fc4b 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -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
diff --git a/.github/workflows/trunk-upgrade.yaml b/.github/workflows/trunk-upgrade.yaml
index d9cf480c..5888e805 100644
--- a/.github/workflows/trunk-upgrade.yaml
+++ b/.github/workflows/trunk-upgrade.yaml
@@ -28,7 +28,7 @@ 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"

From ccbc14f8f56bb407fd558f38f6b00c9d9dc587d8 Mon Sep 17 00:00:00 2001
From: Veronika Gnilitska <veronika.gnilitska@gmail.com>
Date: Thu, 5 Jun 2025 17:19:24 +0300
Subject: [PATCH 2/2] fix: wait for checks and merge with admin

---
 .github/workflows/trunk-upgrade.yaml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/trunk-upgrade.yaml b/.github/workflows/trunk-upgrade.yaml
index 5888e805..8a877079 100644
--- a/.github/workflows/trunk-upgrade.yaml
+++ b/.github/workflows/trunk-upgrade.yaml
@@ -33,11 +33,21 @@ jobs:
           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