This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.5.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.5.0 by this push:
new 7ea0ac2 Improve CI script
7ea0ac2 is described below
commit 7ea0ac22e121d18881f30dca549282229b921c01
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Tue Jul 25 12:06:48 2023 +0200
Improve CI script
---
.github/workflows/build.yml | 27 +++++++++++++++------------
RELEASING.adoc | 4 ++--
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed92818..089a21e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -183,14 +183,14 @@ jobs:
--show-version --batch-mode --errors --no-transfer-progress \
--non-recursive -P distribution
export DIST_FILENAME_PREFIX="apache-log4j-tools"
- export DIST_FILENAME="${DIST_FILENAME_PREFIX}-${PROJECT_VERSION}.zip"
- export DIST_FILEPATH="/tmp/${DIST_FILENAME}"
+ export
DIST_FILENAME_VERSIONED_PREFIX="${DIST_FILENAME_PREFIX}-${PROJECT_VERSION}"
+ export DIST_FILEPATH="/tmp/${DIST_FILENAME_VERSIONED_PREFIX}.zip"
mv "target/dist.zip" "$DIST_FILEPATH"
gpg --armor --detach-sign --yes --pinentry-mode error
"$DIST_FILEPATH"
sha512sum "$DIST_FILEPATH" > "$DIST_FILEPATH.sha512"
cat >> $GITHUB_ENV << EOF
DIST_FILENAME_PREFIX=$DIST_FILENAME_PREFIX
- DIST_FILENAME=$DIST_FILENAME
+ DIST_FILENAME_VERSIONED_PREFIX=$DIST_FILENAME_VERSIONED_PREFIX
DIST_FILEPATH=$DIST_FILEPATH
EOF
@@ -206,17 +206,20 @@ jobs:
"$SVN_DIR"
cd "$SVN_DIR"
- # Generate & add emails
- "$GITHUB_WORKSPACE/.github/generate-email.sh" vote $PROJECT_VERSION
$GITHUB_SHA > "$SVN_DIR/email-vote.txt"
- "$GITHUB_WORKSPACE/.github/generate-email.sh" announce
$PROJECT_VERSION $GITHUB_SHA > "$SVN_DIR/email-announce.txt"
- svn add email-*.txt
+ # Clean up old files
+ find . -name "${DIST_FILENAME_PREFIX}*" -type f -print0 | xargs -0
-r svn delete
- # Clean up old artifacts and add new ones
- find . -name "${DIST_FILENAME_PREFIX}-*" -type f -print0 | xargs -0
-r svn delete
- cp "${DIST_FILEPATH}"* .
- svn add "${DIST_FILENAME}"*
+ # Generate emails
+ for EMAIL_TYPE in vote announce; do
+ "$GITHUB_WORKSPACE/.github/generate-email.sh" $EMAIL_TYPE
$PROJECT_VERSION $GITHUB_SHA \
+ > "${DIST_FILENAME_VERSIONED_PREFIX}-email-${EMAIL_TYPE}.txt"
+ done
+
+ # Copy the distribution
+ cp "$DIST_FILEPATH"* .
- # Commit changes
+ # Add & commit changes
+ svn add "${DIST_FILENAME_PREFIX}"*
svn commit \
--username "$SVN_USERNAME" \
--password "$SVN_PASSWORD" \
diff --git a/RELEASING.adoc b/RELEASING.adoc
index eb9dd7b..a94367d 100644
--- a/RELEASING.adoc
+++ b/RELEASING.adoc
@@ -34,7 +34,7 @@ In the code examples below, assuming the version to be
released is `7.8.0`.
. Commit and push the `release/7.8.0` branch
. Make sure the associated
https://github.com/apache/logging-log4j-tools/actions[GitHub Actions workflow]
succeeds:
.. *Signed artifacts* are uploaded to the _Staging Repositories_ in
https://repository.apache.org/[repository.apache.org]
-.. *Signed distribution and its checksum* (e.g.,
`apache-log4j-tools-7.8.0.{zip,.zip.asc,.zip.sha512}`) are uploaded to
https://dist.apache.org/repos/dist/dev/logging/log4j[dist.apache.org/repos/dist/**dev**/logging/log4j]
Subversion repository
+.. *Signed distribution and its checksum* (e.g.,
`apache-log4j-tools-7.8.0.{zip,.zip.asc,.zip.sha512}`) are uploaded to
https://dist.apache.org/repos/dist/dev/logging/log4j[dist.apache.org/repos/dist/**dev**/logging/log4j]
Subversion repository (along with auxiliary files; email texts, etc.)
+
If not, commit necessary fixes, push, and repeat.
@@ -42,7 +42,7 @@ If not, commit necessary fixes, push, and repeat.
== Vote the release
-. GitHub Actions workflow generates the vote email, send that email.
+. Send the vote email uploaded to the
https://dist.apache.org/repos/dist/dev/logging/log4j[dist.apache.org/repos/dist/**dev**/logging/log4j]
Subversion repository
+
[WARNING]
====
