Update release review instructions#480
Conversation
| . Create a branch from `main-site-pro`, merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!), and push it | ||
| + | ||
| [source,bash] | ||
| ---- | ||
| git checkout main-site-pro | ||
| git rebase origin/main-site-pro # Sync with the remote repository | ||
| git merge rel/7.8.0 # Pull changes up to the newly created tag | ||
| git push origin main-site-pro | ||
| git checkout -B publish-site/7.8.0 origin/main-site-pro | ||
| git merge rel/7.8.0 # Pull changes up to the newly created tag | ||
| git push -u origin publish-site/7.8.0 |
There was a problem hiding this comment.
@ppkarwasz, I think we should truncate and bootstrap main-site-pro from rel/7.8.0, instead of merging rel/7.8.0 to the current state of main-site-pro, since the latter results in an unknown state. WDYT?
FWIW, I don't know what "truncate and bootstrap" exactly translate to, but we can figure that detail out. The point is, after this operation main-site-pro should be identical to rel/7.8.0.
| .. *Signed artifacts* are uploaded to the _Staging Repositories_ in https://repository.apache.org/[repository.apache.org] | ||
| .. *Signed distribution and its checksum* (e.g., `apache-{project-id}-7.8.0-{bin,src}.{zip,.zip.asc,.zip.sha512}`) are uploaded to https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}/7.8.0] Subversion repository (along with auxiliary files; website, email texts, etc.) | ||
| .. {site-url-staging}-7.8.0[The release staging website] is deployed using the freshly populated `release/7.8.0-site-stg-out` branch | ||
| .. Project-specific CI for `release/`-prefixed branches succeeds. |
There was a problem hiding this comment.
These are part of the CI release workflow. This check is not (should not be) needed.
| .. Project-specific CI for `release/`-prefixed branches succeeds. |
There was a problem hiding this comment.
Fixed in ec44eef. Removed the redundant project-specific CI check from the release staging verification list. Verified with git diff --check.
| The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons. | ||
| ==== | ||
| . Merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!) to `main` | ||
| . Create a branch from `main`, merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!), and push it |
There was a problem hiding this comment.
| . Create a branch from `main`, merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!), and push it | |
| . Create a branch from `main`, merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!), and create a PR from that |
There was a problem hiding this comment.
Fixed in ec44eef. Updated the step to say to create a PR from the branch after merging the rel/7.8.0 tag. Verified with git diff --check.
Summary:
integration-test.yamlrelease-review step and call out release-branch CI instead.CI=falsein the local Linux/macOS reproducibility verification command.pom.xmlversion properties alongside the existingsite-project.versionnote.Fixes #479
Verification:
git diff --check(passes; local checkout reports the usual LF-to-CRLF warnings)integration-test.yamlreference is gone and the new PR/reproducibility instructions are presentThis was implemented with Codex assistance, with the final diff reviewed before posting.