From 9fcf8698cc1175cd21444d53d7b71a682c79d059 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 10:46:13 +1100 Subject: [PATCH 1/6] Add missing file to release image --- .github/workflows/package_code.yml | 2 +- admin/MailTemplate.Announce.txt | 12 ++++++------ admin/MailTemplate.Result.txt | 4 ++-- admin/MailTemplate.txt | 10 +++++----- admin/releasing.md | 12 ++++++------ admin/validate-release.ps1 | 2 +- admin/validate-release.sh | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/package_code.yml b/.github/workflows/package_code.yml index 947f2c0d1..d4f6aa7d7 100644 --- a/.github/workflows/package_code.yml +++ b/.github/workflows/package_code.yml @@ -59,7 +59,7 @@ jobs: cd clean-checkout rm -r src/main/abi-symbols VERSION=`grep 'set(log4cxx_VER ' src/cmake/projectVersionDetails.cmake|sed -Ee 's/.*log4cxx_VER ([0-9]*)\.([0-9]*)\.([0-9]*).*/\1.\2.\3/'` - tar -zcf "../apache-log4cxx-$VERSION.tar.gz" "--transform=s,^,apache-log4cxx-$VERSION/," LICENSE NOTICE README.md CMakeLists.txt src liblog4cxx.pc.in liblog4cxx-qt.pc.in + tar -zcf "../apache-log4cxx-$VERSION.tar.gz" "--transform=s,^,apache-log4cxx-$VERSION/," LICENSE NOTICE README.md CMakeLists.txt Config.cmake.in src liblog4cxx.pc.in liblog4cxx-qt.pc.in cd .. sha512sum "apache-log4cxx-$VERSION.tar.gz" > "apache-log4cxx-$VERSION.tar.gz.sha512" sha256sum "apache-log4cxx-$VERSION.tar.gz" > "apache-log4cxx-$VERSION.tar.gz.sha256" diff --git a/admin/MailTemplate.Announce.txt b/admin/MailTemplate.Announce.txt index 971debc6d..abc71f310 100644 --- a/admin/MailTemplate.Announce.txt +++ b/admin/MailTemplate.Announce.txt @@ -1,18 +1,18 @@ To: announce@apache.org, dev@logging.apache.org -Subject: [ANNOUNCE] Apache log4cxx 1.6.2 released +Subject: [ANNOUNCE] Apache log4cxx 1.7.0 released Hi, -The Apache log4cxx team is pleased to announce the 1.6.2 release. +The Apache log4cxx team is pleased to announce the 1.7.0 release. For the list of new features and issues corrected, see: -https://logging.apache.org/log4cxx/1.6.2/changelog.html#rel_1_6_2 +https://logging.apache.org/log4cxx/1.7.0/changelog.html#rel_1_7_0 For official release downloads, see: -https://logging.apache.org/log4cxx/1.6.2/download.html +https://logging.apache.org/log4cxx/1.7.0/download.html For instructions on building Log4cxx, see: -https://logging.apache.org/log4cxx/1.6.2/build.html +https://logging.apache.org/log4cxx/1.7.0/build.html All other information is available on the Log4cxx project website: -https://logging.apache.org/log4cxx/1.6.2 +https://logging.apache.org/log4cxx/1.7.0 diff --git a/admin/MailTemplate.Result.txt b/admin/MailTemplate.Result.txt index e6147f423..50799a4b3 100644 --- a/admin/MailTemplate.Result.txt +++ b/admin/MailTemplate.Result.txt @@ -1,5 +1,5 @@ To: dev@logging.apache.org -Subject: [RESULT][VOTE] Release Apache Log4cxx 1.6.2 +Subject: [RESULT][VOTE] Release Apache Log4cxx 1.7.0 and here is my +1. @@ -9,6 +9,6 @@ I will continue the release process. Stephen --------------------------------------------------------------------------------------------------- -This is a vote to release the Apache Log4cxx 1.6.2. +This is a vote to release the Apache Log4cxx 1.7.0. ... \ No newline at end of file diff --git a/admin/MailTemplate.txt b/admin/MailTemplate.txt index 68e4b5a63..74de42f7d 100644 --- a/admin/MailTemplate.txt +++ b/admin/MailTemplate.txt @@ -1,9 +1,9 @@ To: dev@logging.apache.org -Subject: [VOTE] Release Apache Log4cxx 1.6.2 +Subject: [VOTE] Release Apache Log4cxx 1.7.0 -This is a vote to release the Apache Log4cxx 1.6.2. +This is a vote to release the Apache Log4cxx 1.7.0. -Website: https://logging.staged.apache.org/log4cxx/1.6.2/changelog.html +Website: https://logging.staged.apache.org/log4cxx/changelog.html#rel_1_7_0 GitHub: https://github.com/apache/logging-log4cxx Commit: Distribution: https://dist.apache.org/repos/dist/dev/logging/log4cxx/ @@ -15,6 +15,6 @@ Please download, test, and cast your votes on this mailing list. [ ] +1, release the artifacts [ ] -1, don't release, because ... -This vote is open for 72 hours and will pass unless getting a net negative vote count. -All votes are welcome and we encourage everyone to test the release, but only the +This vote is open for 72 hours and will pass unless it gets a net negative vote count. +All votes are welcome, and we encourage everyone to test the release, but only the Logging Services PMC votes are officially counted. diff --git a/admin/releasing.md b/admin/releasing.md index a9c3aab31..06f464fb2 100644 --- a/admin/releasing.md +++ b/admin/releasing.md @@ -19,8 +19,8 @@ Steps 1. Tag HEAD as the release candidate - `git checkout master` - `git pull` - - `git tag v1.6.1-RC1` - - `git push origin tag v1.6.1-RC1` + - `git tag v1.7.0-RC1` + - `git push origin tag v1.7.0-RC1` 1. Remove the old artifacts from svn - `svn co https://dist.apache.org/repos/dist/dev/logging -N apache-dist-logging-dev` - `cd apache-dist-logging-dev` @@ -31,7 +31,7 @@ Steps - `svn add 1.7.0` - `cd 1.7.0` 1. Download the packaged release files from Github - - Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in your web browser + - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC1 in your web browser - Click the green tick mark on the top commit - The `All checks have passed` pop-up window will display - Click the "Details" link on the row next to `Generate release files / Package code for release` @@ -56,9 +56,9 @@ Steps 1. Get artifacts up to https://downloads.apache.org/logging/log4cxx/ - `svn move -m "Release log4cxx 1.7.0" https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.7.0 https://dist.apache.org/repos/dist/release/logging/log4cxx/` 1. Tag the released version - - `git checkout v1.6.1-RC1` - - `git tag rel/v1.6.1` - - `git push origin tag rel/v1.6.1` + - `git checkout v1.7.0-RC1` + - `git tag rel/v1.7.0` + - `git push origin tag rel/v1.7.0` 1. Enter the release date in `src/site/markdown/change-report-gh.md` - Commit the change - Update the staged web site using [the update procedure](staging.md) diff --git a/admin/validate-release.ps1 b/admin/validate-release.ps1 index 6c2119e2f..d76889e22 100644 --- a/admin/validate-release.ps1 +++ b/admin/validate-release.ps1 @@ -1,7 +1,7 @@ # Allow the version to be provided as a parameter param ( [string]$VERSION ) -if (-not $VERSION) { $VERSION = "1.6.2" } +if (-not $VERSION) { $VERSION = "1.7.0" } $STAGE="dev" #$STAGE="release" diff --git a/admin/validate-release.sh b/admin/validate-release.sh index 5de41d6f5..591f3e0b9 100644 --- a/admin/validate-release.sh +++ b/admin/validate-release.sh @@ -4,7 +4,7 @@ set -e VERSION=$1 if [ -z "$VERSION" ] ; then - VERSION=1.6.2 + VERSION=1.7.0 fi if [ -z "$STAGE" ] ; then From 2264c79a03320f5bf7efeb6f46b1a8aeebe7384a Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 10:52:21 +1100 Subject: [PATCH 2/6] Simplify URLs in announce e-mail --- admin/MailTemplate.Announce.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/MailTemplate.Announce.txt b/admin/MailTemplate.Announce.txt index abc71f310..37da0c2cb 100644 --- a/admin/MailTemplate.Announce.txt +++ b/admin/MailTemplate.Announce.txt @@ -6,13 +6,13 @@ Hi, The Apache log4cxx team is pleased to announce the 1.7.0 release. For the list of new features and issues corrected, see: -https://logging.apache.org/log4cxx/1.7.0/changelog.html#rel_1_7_0 +https://logging.apache.org/log4cxx/changelog.html#rel_1_7_0 For official release downloads, see: -https://logging.apache.org/log4cxx/1.7.0/download.html +https://logging.apache.org/log4cxx/download.html For instructions on building Log4cxx, see: -https://logging.apache.org/log4cxx/1.7.0/build.html +https://logging.apache.org/log4cxx/build.html All other information is available on the Log4cxx project website: -https://logging.apache.org/log4cxx/1.7.0 +https://logging.apache.org/log4cxx From c04779d4ea86f1e17d010bf17e34f61938febfb1 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 11:45:18 +1100 Subject: [PATCH 3/6] Check archive is complete in CI --- .github/workflows/package_code.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package_code.yml b/.github/workflows/package_code.yml index d4f6aa7d7..4572eb514 100644 --- a/.github/workflows/package_code.yml +++ b/.github/workflows/package_code.yml @@ -19,9 +19,9 @@ on: push: branches: - master -# pull_request: -# branches: -# - master + pull_request: + branches: + - master permissions: read-all @@ -70,6 +70,17 @@ jobs: sha256sum "apache-log4cxx-$VERSION.zip" > "apache-log4cxx-$VERSION.zip.sha256" gpg --armor --detach-sign --yes --pinentry-mode error "apache-log4cxx-$VERSION.zip" + - name: 'test archive' + run: | + VERSION=`ls apache-log4cxx-*.tar.gz | sed -Ee 's/.*apache-log4cxx-([0-9]*)\.([0-9]*)\.([0-9]*).*/\1.\2.\3/'` + echo "Extracting files from apache-log4cxx-$VERSION.tar.gz..." + tar xf apache-log4cxx-$VERSION.tar.gz || exit + + cmake -S apache-log4cxx-$VERSION -B test-archive || exit + cmake --build test-archive || exit + cd test-archive + ctest + - uses: actions/upload-artifact@v4 if: always() with: From ff098f81ad42c9da423f60c0f2baa196f5d46f2f Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 11:47:33 +1100 Subject: [PATCH 4/6] Check archive is complete in CI --- .github/workflows/package_code.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/package_code.yml b/.github/workflows/package_code.yml index 4572eb514..767a8347e 100644 --- a/.github/workflows/package_code.yml +++ b/.github/workflows/package_code.yml @@ -70,6 +70,11 @@ jobs: sha256sum "apache-log4cxx-$VERSION.zip" > "apache-log4cxx-$VERSION.zip.sha256" gpg --armor --detach-sign --yes --pinentry-mode error "apache-log4cxx-$VERSION.zip" + - name: 'Configure Dependencies' + run: | + sudo apt-get update + sudo apt-get install -y libapr1-dev libaprutil1-dev + - name: 'test archive' run: | VERSION=`ls apache-log4cxx-*.tar.gz | sed -Ee 's/.*apache-log4cxx-([0-9]*)\.([0-9]*)\.([0-9]*).*/\1.\2.\3/'` From 6ab709f37b6e400b440756759cdbf52e0fd0046a Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 12:07:23 +1100 Subject: [PATCH 5/6] Only generate release files on the master branch --- .github/workflows/package_code.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package_code.yml b/.github/workflows/package_code.yml index 767a8347e..5b173018f 100644 --- a/.github/workflows/package_code.yml +++ b/.github/workflows/package_code.yml @@ -19,9 +19,9 @@ on: push: branches: - master - pull_request: - branches: - - master +# pull_request: +# branches: +# - master permissions: read-all From e934e6a260ebc5256ad0280b8d4599f7f9942b2f Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Tue, 31 Mar 2026 15:34:19 +1100 Subject: [PATCH 6/6] Update release review instructions --- admin/release-review-instructions.md | 2 +- admin/releasing.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/release-review-instructions.md b/admin/release-review-instructions.md index 2754f5ec8..51b5408ed 100644 --- a/admin/release-review-instructions.md +++ b/admin/release-review-instructions.md @@ -37,7 +37,7 @@ Steps - For success, the final output line needs to include: - `100% tests passed, 0 tests failed out of 63` 1. Download the packaged release files from Github - - Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in your web browser + - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC2 in your web browser - Click the green tick mark on the top commit - The `All checks have passed` pop-up window will display - Click the "Details" link on the row next to `Generate release files / Package code for release` diff --git a/admin/releasing.md b/admin/releasing.md index 06f464fb2..f6f3ee466 100644 --- a/admin/releasing.md +++ b/admin/releasing.md @@ -19,8 +19,8 @@ Steps 1. Tag HEAD as the release candidate - `git checkout master` - `git pull` - - `git tag v1.7.0-RC1` - - `git push origin tag v1.7.0-RC1` + - `git tag v1.7.0-RC2` + - `git push origin tag v1.7.0-RC2` 1. Remove the old artifacts from svn - `svn co https://dist.apache.org/repos/dist/dev/logging -N apache-dist-logging-dev` - `cd apache-dist-logging-dev` @@ -31,7 +31,7 @@ Steps - `svn add 1.7.0` - `cd 1.7.0` 1. Download the packaged release files from Github - - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC1 in your web browser + - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC2 in your web browser - Click the green tick mark on the top commit - The `All checks have passed` pop-up window will display - Click the "Details" link on the row next to `Generate release files / Package code for release` @@ -56,7 +56,7 @@ Steps 1. Get artifacts up to https://downloads.apache.org/logging/log4cxx/ - `svn move -m "Release log4cxx 1.7.0" https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.7.0 https://dist.apache.org/repos/dist/release/logging/log4cxx/` 1. Tag the released version - - `git checkout v1.7.0-RC1` + - `git checkout v1.7.0-RC2` - `git tag rel/v1.7.0` - `git push origin tag rel/v1.7.0` 1. Enter the release date in `src/site/markdown/change-report-gh.md`