Skip to content

Chkp nirm patch 1 #152

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 3 commits into from
Nov 18, 2025
Merged

Chkp nirm patch 1 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3108272
Enhance dependency update PR creation workflow
chkp-nirm Nov 18, 2025
ae9f288
Implement auto-merge for Version Packages PRs
chkp-nirm Nov 18, 2025
c8be5e5
Update update-dependencies.yml
chkp-nirm Nov 18, 2025
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
21 changes: 21 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,27 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true

# Auto-merge version PRs after a delay
- name: Auto-merge Version PR
if: steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.hasChangesets == 'true' && steps.changesets.outputs.published != 'true'
run: |
echo "📋 Version PR was created, setting up auto-merge..."

# Wait 5 minutes for any manual review
echo "⏳ Waiting 5 minutes before enabling auto-merge..."
sleep 300

# Find and auto-merge the Version Packages PR
PR_NUMBER=$(gh pr list --search "Version Packages" --json number --jq '.[0].number')
if [ ! -z "$PR_NUMBER" ] && [ "$PR_NUMBER" != "null" ]; then
gh pr merge $PR_NUMBER --auto --squash --delete-branch
echo "✅ Auto-merge enabled for Version Packages PR #$PR_NUMBER"
else
echo "❌ Could not find Version Packages PR to auto-merge"
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# NEW: Create MCPB Release (only when packages are actually published)
- name: Create MCPB Release
if: steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.published == 'true'
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/update-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,20 @@ jobs:
# Create PR with helpful labels and instructions
gh pr create --title "Update dependencies $(date +%Y-%m-%d)" \
--body "Dependency updates and security fixes. Review changes and create changesets if packages need republishing." \
--label "dependencies" \
--label "security"
--label "dependencies"

# Enable auto-merge with a delay for safety
echo "⏳ Waiting 2 minutes before enabling auto-merge..."
sleep 120

# Get the PR number and enable auto-merge
PR_NUMBER=$(gh pr list --head "$BRANCH_NAME" --json number --jq '.[0].number')
if [ ! -z "$PR_NUMBER" ]; then
gh pr merge $PR_NUMBER --auto --squash --delete-branch
echo "✅ Auto-merge enabled for dependency PR #$PR_NUMBER"
else
echo "❌ Could not find PR to enable auto-merge"
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down