-
Notifications
You must be signed in to change notification settings - Fork 10
new release schedule #153
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
new release schedule #153
Conversation
|
@jrcain-usgs @Kelvinrr Where does this PR stand? Is it ready for review? |
|
@acpaquette I think we get the PR picking stuff working first, then we can merge this in case it needs changing. |
docs/how-to-guides/software-management/isis-release-schedule.md
Outdated
Show resolved
Hide resolved
| - [ ] Update the Changelog. Move **only bug fixes and non-breaking features** under this release. Follow the instructions in [CHANGELOG.md](https://raw.githubusercontent.com/DOI-USGS/ISIS3/dev/CHANGELOG.md) for how to do this. | ||
| - [ ] Update `code.json` by adding a new entry with the Prod version. | ||
| - [ ] **Update the Authors List**: If there are any new contributors to the project since the last release, update the `AUTHORS.rst` file to include them. | ||
| - [ ] Submit a Pull Request: Submit a pull request into the release branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Says push to release branch but the next step is to create the branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I was also confused about that. This is from the current doc (not a new addition), going to try and clarify.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that the intention is this:
- We have the release-feeder branch (9-lts)
- CICD auto cherrypicks bugfixes to it
- We manually merge more bugfixes to it (make a PR to 9-lts)
- In what's currently step 1, check for test failures
- In currently step 3, update more files (make a PR to 9-lts)
- In currently step 4, make new branch 9.0.2 from 9-lts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple more things to address, mainly how do we go from RC1 to RC2
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
| - [ ] Update `code.json` by adding a new entry with the new version number and the date last modified. | ||
| - [ ] **Update the Authors List**: If there are any new contributors to the project since the last release, update the `AUTHORS.rst` file to include them. | ||
| - [ ] Submit a Pull Request: Submit a pull request into the dev branch. If a release branch exists, create another PR there as well. | ||
| - [ ] Submit a Pull Request: Submit a pull request into the `dev` branch. If a release branch exists, create another PR there as well. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should make this be a pull request into the RC feeder branch rather than dev. It's very likely that dev will chang between a RC releases
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
docs/how-to-guides/software-management/releases/isis-release-process.md
Outdated
Show resolved
Hide resolved
|
Clarified RC branches: initial checkout from dev, or previous RC, but then everything is pushed to the RC's branch (9.0.0_RC1, 9.0.0_RC2, etc). There is not currently a feeder branch for RCs. |
|
No separate branches per prod/lts releases. prod/lts changes will be pushed to the feeder branch, and then all LTS/Prod releases will be tagged from that branch. |
|
Open to comment on what should be PR-ed to upstream branches, vs. just pushed there |
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:
Fixes DOI-USGS/ISIS3#5795