Draft
Add automatic upmerge workflows to streamline branch maintenance#44
Conversation
Co-authored-by: jpmcmu <7181610+jpmcmu@users.noreply.github.com>
…d fix YAML syntax issues Co-authored-by: jpmcmu <7181610+jpmcmu@users.noreply.github.com>
Copilot
AI
changed the title
Analyze the Github Action in upmerge-test.yml and use it as a guide to create a new Github Action that when the upmerge-test succeeds will automatically upmerge a PR from the candidate branch it was merged into all the way through to master. IE: A PR g...
Add automatic upmerge workflows to streamline branch maintenance
Sep 26, 2025
jpmcmu
pushed a commit
that referenced
this pull request
Dec 3, 2025
…IssuesWorkflow Hpcc4 j 755 baremetal known server issues workflow
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
This PR adds automated upmerge functionality that builds on the existing
upmerge-test.ymlworkflow. When a PR successfully passes the upmerge test, the system now automatically creates upmerge PRs for all compatible target branches, significantly reducing manual maintenance overhead.What's Changed
New Workflows Added
🔄 upmerge-auto.yml - The main automation workflow that:
upmerge-testcompletes successfully💬 upmerge-auto-comment.yml - Result reporting workflow that:
Example Workflow
When a PR is created against
candidate-9.8.x:candidate-9.10.x,candidate-9.12.x, andmasterAuto upmerge from candidate-9.8.x to candidate-9.10.x (Original PR #123)Auto upmerge from candidate-9.8.x to candidate-9.12.x (Original PR #123)Auto upmerge from candidate-9.8.x to master (Original PR #123)Safety Features
AUTO_UPMERGE_DRY_RUN=truefor testingConfiguration
The workflows require these permissions (already included):
contents: write- Create branches and commitspull-requests: write- Create PRs and post commentsactions: read- Download test artifactsOptional repository variable:
AUTO_UPMERGE_DRY_RUN- Set to "true" to enable dry-run modeDocumentation
Added comprehensive documentation in
docs/AUTO_UPMERGE.mdcovering:Benefits
This automation will significantly streamline the branch maintenance process while maintaining all existing safety controls.
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
central.sonatype.com/usr/lib/jvm/temurin-17-jdk-amd64/bin/java --enable-native-access=ALL-UNNAMED -classpath /usr/share/apache-maven-3.9.11/boot/plexus-classworlds-2.9.0.jar -Dclassworlds.conf=/usr/share/apache-maven-3.9.11/bin/m2.conf -Dmaven.home=/usr/share/apache-maven-3.9.11 -Dlibrary.jansi.path=/usr/share/apache-maven-3.9.11/lib/jansi-native -Dmaven.multiModuleProjectDirectory=/home/REDACTED/work/HPCC-JAPIs/HPCC-JAPIs org.codehaus.plexus.classworlds.launcher.Launcher clean compile -q(dns block)If you need me to access, download, or install something from one of these locations, you can either:
Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.