You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@logging.apache.org by "omribz156 (via GitHub)" <gi...@apache.org> on 2026/05/16 16:42:10 UTC
[PR] Update release review instructions [logging-parent]
omribz156 opened a new pull request, #480:
URL: https://github.com/apache/logging-parent/pull/480
Summary:
- Remove the stale manual Log4j `integration-test.yaml` release-review step and call out release-branch CI instead.
- Set `CI=false` in the local Linux/macOS reproducibility verification command.
- Update post-vote git instructions to push branches and open PRs instead of merging directly to protected branches.
- Mention Log4j site-related `pom.xml` version properties alongside the existing `site-project.version` note.
Fixes #479
Verification:
- `git diff --check` (passes; local checkout reports the usual LF-to-CRLF warnings)
- Static search confirmed the stale `integration-test.yaml` reference is gone and the new PR/reproducibility instructions are present
This was implemented with Codex assistance, with the final diff reviewed before posting.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3258099327
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -220,16 +221,17 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files released'
[#publish-release-website]
== Publish the release website
-. Merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!) to `main-site-pro` and push it
+. 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
Review 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`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "ppkarwasz (via GitHub)" <gi...@apache.org>.
ppkarwasz commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3773494803
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -220,16 +221,17 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files released'
[#publish-release-website]
== Publish the release website
-. Merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!) to `main-site-pro` and push it
+. 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
Review Comment:
We can use:
```bash
git push --force-with-lease origin rel/7.8.0:main-site-pro
```
with some exceptions for LTS releases. For an LTS release you need to:
1. First cherry-pick the changelog entry to the “main” branch.
2. Then cherry-pick the same commit to `main-site-pro`.
Basically we are happy to sync the website with the code during a release (and remove all documentation changes done since the previous one, since those changes should already be present in the main branch). For LTS releases we only want to cherry-pick the changelog.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3700023372
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -154,16 +148,22 @@ git push origin rel/7.8.0
====
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 create a PR from that
Review Comment:
```suggestion
. Create a branch from `main`, and merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!) onto it:
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "omribz156 (via GitHub)" <gi...@apache.org>.
omribz156 commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3537665155
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -89,6 +90,7 @@ You can iterate on the `release/7.8.0` branch to perfect it.
.. *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.
Review Comment:
Fixed in ec44eef. Removed the redundant project-specific CI check from the release staging verification list. Verified with git diff --check.
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -154,16 +149,22 @@ git push origin rel/7.8.0
====
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
Review 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3700013033
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
Review Comment:
Commit signatures are not needed anymore:
```suggestion
git commit -a -m 'Prepare to release `7.8.0`'
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Update release review instructions [logging-parent]
Posted by "vy (via GitHub)" <gi...@apache.org>.
vy commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3700020060
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
Review Comment:
```suggestion
Release branch::
`main`
Project ID::
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@logging.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org