HPCC-35885 Provide upmergeability test workflow#21004
Open
jpmcmu wants to merge 4 commits intohpcc-systems:candidate-9.12.xfrom
Open
HPCC-35885 Provide upmergeability test workflow#21004jpmcmu wants to merge 4 commits intohpcc-systems:candidate-9.12.xfrom
jpmcmu wants to merge 4 commits intohpcc-systems:candidate-9.12.xfrom
Conversation
|
Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-35885 Jirabot Action Result: |
- Migrated HPCC4J upmerge test workflow to HPCC project Signed-off-by: James McMullan James.McMullan@lexisnexis.com
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new GitHub Actions workflow intended to validate “upmergeability” of PRs targeting candidate branches in the HPCC Platform repo.
Changes:
- Introduces an
upmerge-testworkflow triggered on PR open/reopen againstcandidate-*branches. - Computes a list of “upmerge target” branches from git tags and checks for merge conflicts via
git merge-tree. - Uploads JSON/text artifacts and fails the workflow when conflicts are detected.
Contributor
Author
|
Examples of upmerge comments: Successful workflow run: |
ghalliday
reviewed
Mar 5, 2026
Member
ghalliday
left a comment
There was a problem hiding this comment.
One question. Main proof will be enabling and looking at the results.
| return versions | ||
| else: | ||
| # Extract candidate branch major / minor version | ||
| candidateBranchPattern = re.compile(r"candidate-([0-9]+\.[0-9]+\.([0-9]+|x)).*") |
Member
There was a problem hiding this comment.
Should this unconditionally add "master"?
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.
Signed-off-by: James McMullan James.McMullan@lexisnexis.com
Type of change:
Checklist:
Smoketest:
Testing: