Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .github/workflows/package_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -70,6 +70,22 @@ 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/'`
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:
Expand Down
12 changes: 6 additions & 6 deletions admin/MailTemplate.Announce.txt
Original file line number Diff line number Diff line change
@@ -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/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/download.html

For instructions on building Log4cxx, see:
https://logging.apache.org/log4cxx/1.6.2/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.6.2
https://logging.apache.org/log4cxx
4 changes: 2 additions & 2 deletions admin/MailTemplate.Result.txt
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.

...
10 changes: 5 additions & 5 deletions admin/MailTemplate.txt
Original file line number Diff line number Diff line change
@@ -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: <todo insert>
Distribution: https://dist.apache.org/repos/dist/dev/logging/log4cxx/
Expand All @@ -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.
2 changes: 1 addition & 1 deletion admin/release-review-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
12 changes: 6 additions & 6 deletions admin/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-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`
Expand All @@ -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-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`
Expand All @@ -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-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`
- Commit the change
- Update the staged web site using [the update procedure](staging.md)
Expand Down
2 changes: 1 addition & 1 deletion admin/validate-release.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion admin/validate-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading