Cherrypick with comment when manual action needed.#5945
Cherrypick with comment when manual action needed.#5945jrcain-usgs wants to merge 3 commits intoDOI-USGS:devfrom
Conversation
|
The build and test suite have started for your pull request. To view your build log, please reference the build with source version: "PR_5945". Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch. |
|
The build and test suite have started for your pull request. To view your build log, please reference the build with source version: "PR_5945". Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch. |
| env: | ||
| ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} | ||
| GITHUB_SHA: ${{ github.sha }} | ||
| CURRENT_LTS: 9-lts |
There was a problem hiding this comment.
Does this have to be manually updated when we have a new lts? Might be worth having the CI look for the latest versioned branch with -lts so we don't have to manually update this.
There was a problem hiding this comment.
I definitely want it to auto-detect the latest version... Looking at it right now - if I can't figure it out by today I may open a separate issue for it.
| Maintainers (@jrcain-usgs @Kelvinrr): Please cherry-pick this bugfix to LTS. | ||
| PR: #${{ steps.getpr.outputs.pr }} | ||
| SHA: ${{ github.sha }}. | ||
|
|
||
| You may use the following commands to cherry-pick | ||
| (Assuming you have the DOI-USGS/ISIS3 repo as a remote named `upstream`): | ||
| ``` | ||
| git fetch upstream | ||
| git checkout -b cherry-${{ steps.getpr.outputs.pr }} upstream/${{ env.CURRENT_LTS }} | ||
| git cherry-pick -m 1 ${{ github.sha }} | ||
|
|
||
| # Resolve Merge Conflicts Manually | ||
|
|
||
| # Then push to LTS | ||
| git push --set-upstream upstream ${{ env.CURRENT_LTS }} |
There was a problem hiding this comment.
The only concern I have with this is it can get lost in the merged PRs or in your email. But not sure of a better solution. Maybe generate an issue? Not sure.
There was a problem hiding this comment.
I also thought generating an issue would be a good idea, Pro: we could tag, group, and see all the waiting cherry-picks. Con: @Kelvinrr was worried we would end up with too many issues, so I didn't add that for now. We could discuss at the changelogs meeting Tuesday.
|
The build and test suite have started for your pull request. To view your build log, please reference the build with source version: "PR_5945". Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch. |
2 participants
Description
Updates cherrypick to leave a comment when the auto cherry-pick fails so a maintainer can complete the cherry-pick manually.
Related Issue
How Has This Been Validated?
Jobs with successful (did what it was supposed to do) runs:
Auto Cherry-Pick: https://github.com/jrcain-usgs/ISIS3/actions/runs/21187425484/job/60945671616
Failed Cherry-Pick and Comment: https://github.com/jrcain-usgs/ISIS3/actions/runs/21081391187/job/60635711481
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: