From 633dfea2f237e87cf58f555e56fc004ffe903644 Mon Sep 17 00:00:00 2001 From: John Davis Date: Mon, 25 Mar 2024 14:59:15 -0400 Subject: [PATCH 1/4] Fix typo --- galaxy_release_util/bootstrap_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy_release_util/bootstrap_history.py b/galaxy_release_util/bootstrap_history.py index 4d9df91..4e74499 100644 --- a/galaxy_release_util/bootstrap_history.py +++ b/galaxy_release_util/bootstrap_history.py @@ -279,7 +279,7 @@ - [ ] Commit release notes. git add docs/; git commit -m "Release notes for $version"; git push upstream ${version}_release_notes - - [ ] Open a pull request for new release note branch. + - [ ] Open a pull request for new release notes branch. - [ ] Merge release note pull request. - [ ] **Do Release** From bcc69e76d9d0346aac9c306de2a8b4aefd050822 Mon Sep 17 00:00:00 2001 From: John Davis Date: Mon, 25 Mar 2024 15:06:56 -0400 Subject: [PATCH 2/4] Change wording for creating release notes branch --- galaxy_release_util/bootstrap_history.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galaxy_release_util/bootstrap_history.py b/galaxy_release_util/bootstrap_history.py index 4e74499..f209a4d 100644 --- a/galaxy_release_util/bootstrap_history.py +++ b/galaxy_release_util/bootstrap_history.py @@ -267,7 +267,7 @@ - [ ] **Create Release Notes** - [ ] Review merged PRs and ensure they all have a milestone attached. [Link](https://github.com/galaxyproject/galaxy/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Amerged+no%3Amilestone+-label%3Amerge+) - - [ ] Checkout release branch + - [ ] Switch to release branch and create a new branch for release notes git checkout release_${version} -b ${version}_release_notes - [ ] Bootstrap the release notes @@ -279,7 +279,7 @@ - [ ] Commit release notes. git add docs/; git commit -m "Release notes for $version"; git push upstream ${version}_release_notes - - [ ] Open a pull request for new release notes branch. + - [ ] Open a pull request for the release notes branch. - [ ] Merge release note pull request. - [ ] **Do Release** From 630a473da19547264d030b8c58b9e470e4fafadb Mon Sep 17 00:00:00 2001 From: John Davis Date: Mon, 25 Mar 2024 15:12:59 -0400 Subject: [PATCH 3/4] Edit for consistent language (pull request vs PR) --- galaxy_release_util/bootstrap_history.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/galaxy_release_util/bootstrap_history.py b/galaxy_release_util/bootstrap_history.py index f209a4d..cb50e43 100644 --- a/galaxy_release_util/bootstrap_history.py +++ b/galaxy_release_util/bootstrap_history.py @@ -230,7 +230,7 @@ - [ ] **Branch Release (on or around ${freeze_date})** - - [ ] Ensure all [blocking milestone PRs](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged, delayed, or closed. + - [ ] Ensure all [blocking milestone pull requests](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged, delayed, or closed. make release-check-blocking-prs @@ -245,8 +245,8 @@ make release-create-rc - - [ ] Open PRs from your fork of branch ``version-${version}`` to upstream ``release_${version}`` and of ``version-${next_version}.dev`` to ``dev``. - - [ ] Update ``MILESTONE_NUMBER`` in the [maintenance bot](https://github.com/galaxyproject/galaxy/blob/dev/.github/workflows/maintenance_bot.yaml) to `${next_version}` so it properly tags new PRs. + - [ ] Open pull requests from your fork of branch ``version-${version}`` to upstream ``release_${version}`` and of ``version-${next_version}.dev`` to ``dev``. + - [ ] Update ``MILESTONE_NUMBER`` in the [maintenance bot](https://github.com/galaxyproject/galaxy/blob/dev/.github/workflows/maintenance_bot.yaml) to `${next_version}` so it properly tags new pull requests. - [ ] **Issue Review Timeline Notes** @@ -266,7 +266,7 @@ - [ ] **Create Release Notes** - - [ ] Review merged PRs and ensure they all have a milestone attached. [Link](https://github.com/galaxyproject/galaxy/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Amerged+no%3Amilestone+-label%3Amerge+) + - [ ] Review merged pull requests and ensure they all have a milestone attached. [Link](https://github.com/galaxyproject/galaxy/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Amerged+no%3Amilestone+-label%3Amerge+) - [ ] Switch to release branch and create a new branch for release notes git checkout release_${version} -b ${version}_release_notes @@ -287,11 +287,11 @@ - [ ] Ensure all [blocking milestone issues](https://github.com/galaxyproject/galaxy/issues?q=is%3Aopen+is%3Aissue+milestone%3A${version}) have been resolved. make release-check-blocking-issues RELEASE_CURR=${version} - - [ ] Ensure all [blocking milestone PRs](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged or closed. + - [ ] Ensure all [blocking milestone pull requests](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged or closed. make release-check-blocking-prs RELEASE_CURR=${version} - - [ ] Ensure all PRs merged into the pre-release branch during the freeze have [milestones attached](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_${version}+is%3Amerged+no%3Amilestone) and that they are the not [${next_version} milestones](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_${version}+is%3Amerged+milestone%3A${next_version}) - - [ ] Ensure release notes include all PRs added during the freeze by re-running the release note bootstrapping: + - [ ] Ensure all pull requests merged into the pre-release branch during the freeze have [milestones attached](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_${version}+is%3Amerged+no%3Amilestone) and that they are the not [${next_version} milestones](https://github.com/galaxyproject/galaxy/pulls?q=is%3Apr+is%3Aclosed+base%3Arelease_${version}+is%3Amerged+milestone%3A${next_version}) + - [ ] Ensure release notes include all pull requests added during the freeze by re-running the release note bootstrapping: make release-bootstrap-history - [ ] Ensure previous release is merged into current. [GitHub branch comparison](https://github.com/galaxyproject/galaxy/compare/release_${version}...release_${previous_version}) From 94088936a18df34a8449fcc0d7a2cb8e4971c482 Mon Sep 17 00:00:00 2001 From: John Davis Date: Mon, 25 Mar 2024 15:15:59 -0400 Subject: [PATCH 4/4] Remove commit release notes branch step 1. We don't push to upstream at this point 2. Committing changes before opening a PR is an obvious step, I think. --- galaxy_release_util/bootstrap_history.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/galaxy_release_util/bootstrap_history.py b/galaxy_release_util/bootstrap_history.py index cb50e43..f16b705 100644 --- a/galaxy_release_util/bootstrap_history.py +++ b/galaxy_release_util/bootstrap_history.py @@ -276,9 +276,6 @@ - [ ] Open newly created files and manually curate major topics and release notes. - [ ] Run ``python scripts/release-diff.py release_${previous_version}`` and add configuration changes to release notes. - [ ] Add new release to doc/source/releases/index.rst - - [ ] Commit release notes. - - git add docs/; git commit -m "Release notes for $version"; git push upstream ${version}_release_notes - [ ] Open a pull request for the release notes branch. - [ ] Merge release note pull request.