Skip to content

Fix merge-main-to-development workflow for protected branch#2264

Merged
mikib0 merged 2 commits into
mainfrom
copilot/fix-failing-ci-workflow
Apr 22, 2026
Merged

Fix merge-main-to-development workflow for protected branch#2264
mikib0 merged 2 commits into
mainfrom
copilot/fix-failing-ci-workflow

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 20, 2026

The workflow was failing with 409 - protected branch 'development' check failed: Changes must be made through a pull request because it attempted to directly merge main into the now-protected development branch.

Changes

  • Replace devmasx/merge-branch@v1.4.0 with peter-evans/create-pull-request@v7
  • Update checkout ref from development to main (source branch for PR)
  • Configure automated PR creation:
    • Branch: sync-main-to-development
    • Base: development
    • Auto-delete branch after merge
    • Label: automated

The workflow now creates a PR instead of direct merge, complying with branch protection rules.

…velopment branch

Agent-Logs-Url: https://github.com/PackRat-AI/PackRat/sessions/da9ec54f-ae67-42c6-b1d5-9a1c96104e1a

Co-authored-by: mikib0 <54102880+mikib0@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the “merge main into development” GitHub Actions workflow to comply with branch protection rules on development by switching from a direct merge to opening an automated pull request.

Changes:

  • Replace devmasx/merge-branch with peter-evans/create-pull-request to propose changes via PR.
  • Checkout main (as the PR source) rather than development.
  • Configure the PR branch name, base branch, labels, and auto-delete behavior.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/merge-main-to-development.yml
Copy link
Copy Markdown
Collaborator

@Isthisanmol Isthisanmol left a comment

Choose a reason for hiding this comment

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

Lgtm

@mikib0 mikib0 marked this pull request as ready for review April 21, 2026 13:58
@cloudflare-workers-and-pages
Copy link
Copy Markdown
Contributor

cloudflare-workers-and-pages Bot commented Apr 21, 2026

Deploying packrat-guides with  Cloudflare Pages  Cloudflare Pages

Latest commit: f2242ad
Status: ✅  Deploy successful!
Preview URL: https://f9ebaed7.packrat-guides-6gq.pages.dev
Branch Preview URL: https://copilot-fix-failing-ci-workf.packrat-guides-6gq.pages.dev

View logs

@github-actions github-actions Bot added the ci/cd label Apr 21, 2026
@cloudflare-workers-and-pages
Copy link
Copy Markdown
Contributor

cloudflare-workers-and-pages Bot commented Apr 21, 2026

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Updated (UTC)
❌ Deployment failed
View logs
packrat-admin f2242ad Apr 21 2026, 02:00 PM

@cloudflare-workers-and-pages
Copy link
Copy Markdown
Contributor

Deploying packrat-landing with  Cloudflare Pages  Cloudflare Pages

Latest commit: f2242ad
Status: ✅  Deploy successful!
Preview URL: https://134f46d3.packrat-landing.pages.dev
Branch Preview URL: https://copilot-fix-failing-ci-workf.packrat-landing.pages.dev

View logs

@mikib0 mikib0 merged commit a49d8a0 into main Apr 22, 2026
7 of 9 checks passed
@mikib0 mikib0 deleted the copilot/fix-failing-ci-workflow branch April 22, 2026 07:51
andrew-bierman pushed a commit that referenced this pull request May 14, 2026
Fix merge-main-to-development workflow for protected branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants