Skip to content

chore: reusable trunk-upgrade #52

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
merged 1 commit into from
Aug 21, 2025
Merged

chore: reusable trunk-upgrade #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# Order is important: the last matching pattern takes the most precedence

# These owners will be the default owners for everything
* @masterpointio/masterpoint-open-source @masterpoint-team
* @masterpointio/masterpoint-open-source
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

❓ Verification inconclusive

Default owners simplification looks right; please verify team slug and access

Removing a redundant team entry reduces noise. Confirm that @masterpointio/masterpoint-open-source is an org team with repo access, so CODEOWNERS can request reviews successfully.

You can verify with GitHub CLI:

🏁 Script executed:

#!/bin/bash
set -euo pipefail

ORG="masterpointio"
TEAM_SLUG="masterpoint-open-source"
REPO="masterpointio/terraform-module-template"

# 1) Team exists
gh api /orgs/$ORG/teams/$TEAM_SLUG >/dev/null && echo "Team exists: $ORG/$TEAM_SLUG"

# 2) Team has repo access (any level)
gh api /orgs/$ORG/teams/$TEAM_SLUG/repos/$REPO >/dev/null && echo "Team has access to $REPO"

Length of output: 336

Fix invalid team slug in CODEOWNERS

Our verification script returned 404 errors when checking both the team’s existence and its repo access, which means the entry in your .github/CODEOWNERS file will not work as-is:

  • File: .github/CODEOWNERS
    Line: 7
    Entry: 
    - *             @masterpointio/masterpoint-open-source

Please address this critical issue:

  • Confirm the exact GitHub team slug (it may differ from masterpoint-open-source).
  • If the team doesn’t exist yet, create it under masterpointio and grant it access to masterpointio/terraform-module-template.
  • Update the CODEOWNERS entry with the correct slug once established, for example: 
    - *             @masterpointio/masterpoint-open-source
+ *             @masterpointio/<correct-team-slug>

Until this is fixed, CODEOWNERS reviews cannot be requested as intended.

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents 
.github/CODEOWNERS around line 7: the team slug
"@masterpointio/masterpoint-open-source" is invalid and caused 404s; verify the
correct GitHub team slug under the masterpointio org (it may differ), or if the
team does not exist create the team under masterpointio, grant it access to the
masterpointio/terraform-module-template repo (with required permission level),
then update the CODEOWNERS entry on line 7 to use the exact confirmed slug
(e.g., @masterpointio/<correct-slug>) so CODEOWNERS resolution succeeds.

51 changes: 6 additions & 45 deletions .github/workflows/trunk-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,49 +19,10 @@ jobs:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Create Token for MasterpointBot App
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a #v2.1.0
id: generate-token
- name: Run Trunk Upgrade
uses: masterpointio/github-action-trunk-upgrade@v0.1.0
with:
app_id: ${{ secrets.MP_BOT_APP_ID }}
private_key: ${{ secrets.MP_BOT_APP_PRIVATE_KEY }}

- name: Upgrade
id: trunk-upgrade
uses: trunk-io/trunk-action/upgrade@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
with:
github-token: ${{ steps.generate-token.outputs.token }}
reviewers: "@masterpointio/masterpoint-internal"
prefix: "chore: "

- name: Wait for checks to pass + Merge PR
if: steps.trunk-upgrade.outputs.pull-request-number != ''
env:
GH_TOKEN: ${{ secrets.MASTERPOINT_TEAM_PAT }}
PR_NUMBER: ${{ steps.trunk-upgrade.outputs.pull-request-number }}
run: |
echo "Waiting for required status checks to pass on PR #$PR_NUMBER..."
while true; do
CHECKS_JSON=$(gh pr checks "$PR_NUMBER" --required --json state,bucket)
echo "Current checks status: $CHECKS_JSON"

if echo "$CHECKS_JSON" | jq -e '.[] | select(.bucket=="fail")' > /dev/null; then
echo "One or more required checks have failed. Exiting..."
exit 1
fi

FAILED_OR_PENDING_CHECKS=$(echo "$CHECKS_JSON" | jq '[.[] | select(.state!="SUCCESS" or .bucket!="pass")] | length')
if [ "$FAILED_OR_PENDING_CHECKS" -eq 0 ]; then
echo "All required checks passed. Auto-approving and merging PR https://github.com/${{ github.repository }}/pull/$PR_NUMBER..."

# Auto-approve the PR
gh pr review "$PR_NUMBER" --approve --body "Auto-approved by trunk upgrade workflow"

# Merge the PR
gh pr merge "$PR_NUMBER" --squash --delete-branch --admin
break
else
echo "Some required checks are still running or pending. Retrying in 30s..."
sleep 30
fi
done
app-id: ${{ secrets.MP_BOT_APP_ID }}
app-private-key: ${{ secrets.MP_BOT_APP_PRIVATE_KEY }}
github-token: ${{ secrets.MASTERPOINT_TEAM_PAT }}
reviewers: "@masterpointio/masterpoint-open-source"
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ backend.tf.json

# Other
**/*.backup
***/*.tmp
**/*.tmp
**/*.temp
**/*.bak
**/*.*swp
Expand Down