Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
* @masterpointio/masterpoint-open-source @masterpoint-team
Copy link

Choose a reason for hiding this comment

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

⚠️ Potential issue

Invalid team slug – missing organization prefix

@masterpoint-team lacks the @org/ prefix required by GitHub CODEOWNERS. As-is, ownership resolution will silently fail and PRs will still demand a manual review.

-*             @masterpointio/masterpoint-open-source @masterpoint-team
+*             @masterpointio/masterpoint-open-source @masterpointio/masterpoint-team
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
* @masterpointio/masterpoint-open-source @masterpoint-team
* @masterpointio/masterpoint-open-source @masterpointio/masterpoint-team
🤖 Prompt for AI Agents
In the .github/CODEOWNERS file at line 7, the team slug '@masterpoint-team' is
missing the required organization prefix. Update '@masterpoint-team' to include
the organization prefix, changing it to '@masterpointio/masterpoint-team' to
ensure proper ownership resolution by GitHub.

9 changes: 7 additions & 2 deletions .github/workflows/trunk-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Wait for checks to pass + Merge PR
if: steps.trunk-upgrade.outputs.pull-request-number != ''
env:
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
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..."
Expand All @@ -52,7 +52,12 @@ jobs:

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. Merging PR https://github.com/${{ github.repository }}/pull/$PR_NUMBER..."
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
Expand Down