Skip to content

Conversation

@jrcain-usgs
Copy link
Contributor

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:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

Fixes DOI-USGS/ISIS3#5795

@jrcain-usgs jrcain-usgs marked this pull request as ready for review June 6, 2025 17:16
@jrcain-usgs jrcain-usgs changed the title new release schedule draft new release schedule Jun 10, 2025
@acpaquette
Copy link
Contributor

@jrcain-usgs @Kelvinrr Where does this PR stand? Is it ready for review?

@Kelvinrr
Copy link
Collaborator

@acpaquette I think we get the PR picking stuff working first, then we can merge this in case it needs changing.

- [ ] 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.
Copy link
Collaborator

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?

Copy link
Contributor Author

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.

Copy link
Contributor Author

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:

  1. We have the release-feeder branch (9-lts)
  2. CICD auto cherrypicks bugfixes to it
  3. We manually merge more bugfixes to it (make a PR to 9-lts)
  4. In what's currently step 1, check for test failures
  5. In currently step 3, update more files (make a PR to 9-lts)
  6. In currently step 4, make new branch 9.0.2 from 9-lts

Copy link
Contributor

@acpaquette acpaquette left a 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

- [ ] 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.
Copy link
Contributor

@acpaquette acpaquette Sep 26, 2025

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

@jrcain-usgs
Copy link
Contributor Author

jrcain-usgs commented Sep 26, 2025

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.

@jrcain-usgs
Copy link
Contributor Author

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.

@jrcain-usgs
Copy link
Contributor Author

Open to comment on what should be PR-ed to upstream branches, vs. just pushed there

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Astrogeology docs to match new release schedule

3 participants