File tree Expand file tree Collapse file tree 2 files changed +35
-2
lines changed Expand file tree Collapse file tree 2 files changed +35
-2
lines changed Original file line number Diff line number Diff line change 9494 NODE_AUTH_TOKEN : ${{ secrets.NPM_TOKEN }}
9595 NPM_CONFIG_PROVENANCE : true
9696
97+ # Auto-merge version PRs after a delay
98+ - name : Auto-merge Version PR
99+ if : steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.hasChangesets == 'true' && steps.changesets.outputs.published != 'true'
100+ run : |
101+ echo "📋 Version PR was created, setting up auto-merge..."
102+
103+ # Wait 5 minutes for any manual review
104+ echo "⏳ Waiting 5 minutes before enabling auto-merge..."
105+ sleep 300
106+
107+ # Find and auto-merge the Version Packages PR
108+ PR_NUMBER=$(gh pr list --search "Version Packages" --json number --jq '.[0].number')
109+ if [ ! -z "$PR_NUMBER" ] && [ "$PR_NUMBER" != "null" ]; then
110+ gh pr merge $PR_NUMBER --auto --squash --delete-branch
111+ echo "✅ Auto-merge enabled for Version Packages PR #$PR_NUMBER"
112+ else
113+ echo "❌ Could not find Version Packages PR to auto-merge"
114+ fi
115+ env :
116+ GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
117+
97118 # NEW: Create MCPB Release (only when packages are actually published)
98119 - name : Create MCPB Release
99120 if : steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.published == 'true'
Original file line number Diff line number Diff line change 5656 # Create PR with helpful labels and instructions
5757 gh pr create --title "Update dependencies $(date +%Y-%m-%d)" \
5858 --body "Dependency updates and security fixes. Review changes and create changesets if packages need republishing." \
59- --label "dependencies" \
60- --label "security"
59+ --label "dependencies"
60+
61+ # Enable auto-merge with a delay for safety
62+ echo "⏳ Waiting 2 minutes before enabling auto-merge..."
63+ sleep 120
64+
65+ # Get the PR number and enable auto-merge
66+ PR_NUMBER=$(gh pr list --head "$BRANCH_NAME" --json number --jq '.[0].number')
67+ if [ ! -z "$PR_NUMBER" ]; then
68+ gh pr merge $PR_NUMBER --auto --squash --delete-branch
69+ echo "✅ Auto-merge enabled for dependency PR #$PR_NUMBER"
70+ else
71+ echo "❌ Could not find PR to enable auto-merge"
72+ fi
6173 env :
6274 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
6375
You can’t perform that action at this time.
0 commit comments