Skip to content

Automate patch upmerge from older release branches#173

Draft
Copilot wants to merge 4 commits intodevelopfrom
copilot/add-github-action-automation
Draft

Automate patch upmerge from older release branches#173
Copilot wants to merge 4 commits intodevelopfrom
copilot/add-github-action-automation

Conversation

Copy link

Copilot AI commented Jan 29, 2026

Description:

Patches to older release branches (e.g., release-1.5) weren't being propagated to newer releases and main. This workflow triggers on push to any release-* branch, compares versions via git tags, and creates PRs to upmerge if the current branch is older than latest.

Key implementation:

  • Extracts version from branch name, finds latest via git tag --sort=-version:refname
  • Numeric semantic version comparison (handles major/minor correctly)
  • Branch existence check before PR creation to avoid failures
  • Uses repo-sync/pull-request action for consistency with existing workflows

Security:

  • Explicit token permissions: contents: read, pull-requests: write
  • Uses PAT for branch protection bypass (same pattern as other workflows)

Related:
#141

Visual:
N/A - workflow automation only

TODO:

  • Updated README documents
  • Complete PR Body

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Copilot AI and others added 3 commits January 29, 2026 23:47
Co-authored-by: devlinjunker <1504590+devlinjunker@users.noreply.github.com>
… v4, better version comparison

Co-authored-by: devlinjunker <1504590+devlinjunker@users.noreply.github.com>
Co-authored-by: devlinjunker <1504590+devlinjunker@users.noreply.github.com>
Copilot AI changed the title [WIP] Add GitHub action for issue automation Automate patch upmerge from older release branches Jan 30, 2026
Copilot AI requested a review from devlinjunker January 30, 2026 00:02
@devlinjunker devlinjunker added the poc Proof of Concept of a Feature/Technical Design label Jan 30, 2026
@devlinjunker
Copy link
Owner

will patches be in main already? or does this branching strategy expect that patches should be merged to an older release first (where issue is faced and the version is supported), and then propagated forward to future releases? @copilot

Copy link
Author

Copilot AI commented Jan 30, 2026

will patches be in main already? or does this branching strategy expect that patches should be merged to an older release first (where issue is faced and the version is supported), and then propagated...

The branching strategy expects patches to be created on the older release branch first (where the issue is faced and the version is still supported), then propagated forward to newer releases and main.

This workflow triggers when a patch is pushed to an older release-* branch (e.g., release-1.5). It then creates PRs to upmerge those changes to:

  1. The most recent release-* branch (e.g., release-1.7)
  2. The main branch

This ensures that bug fixes in older supported versions are also applied to all newer versions, following the pattern described in issue #141.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

poc Proof of Concept of a Feature/Technical Design

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants