This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit a441753a902c684d595916f0f3ec97ea96623f1a Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Sep 3 20:57:25 2024 +0200 Fix the release review kit --- .github/generate-email.sh | 16 +++++++++++----- .github/release-review-kit.txt | 20 ++++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/generate-email.sh b/.github/generate-email.sh index cbe7572..13a77bd 100755 --- a/.github/generate-email.sh +++ b/.github/generate-email.sh @@ -37,12 +37,13 @@ fail_for_invalid_args() { # Constants PROJECT_NAME="Apache Logging Parent" -PROJECT_SITE="https://logging.apache.org/logging-parent"; +PROJECT_ID="logging-parent" +PROJECT_SITE="https://logging.apache.org/$PROJECT_ID"; PROJECT_STAGING_SITE="${PROJECT_SITE/apache.org/staged.apache.org}" -PROJECT_REPO="https://github.com/apache/logging-parent"; -PROJECT_DIST_DIR="https://dist.apache.org/repos/dist/dev/logging/logging-parent"; +PROJECT_REPO="https://github.com/apache/$PROJECT_ID"; PROJECT_VERSION="$2" COMMIT_ID="$3" +PROJECT_DIST_URL="https://dist.apache.org/repos/dist/dev/logging/$PROJECT_ID/$PROJECT_VERSION"; # Check release notes file RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pages/_release-notes/$PROJECT_VERSION.adoc" @@ -52,10 +53,15 @@ RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pag } dump_review_kit() { + local shortCommitId="${COMMIT_ID:0:8}" cat "$SCRIPT_DIR/release-review-kit.txt" \ | sed -n '/-----8<-----~( cut here )~-----8<-----/,$p' \ | tail -n +2 \ - | sed -r 's!^! !g' + | sed -r "s|^| |g" + | sed -r "s|@PROJECT_ID@|$PROJECT_ID|g" + | sed -r "s|@PROJECT_VERSION@|$PROJECT_VERSION|g" + | sed -r "s|@PROJECT_DIST_URL@|$PROJECT_DIST_URL|g" + | sed -r "s|@COMMIT_ID@|$shortCommitId|g" } dump_release_notes() { @@ -76,7 +82,7 @@ This is a lazy-vote to release the $PROJECT_NAME \`$PROJECT_VERSION\`. Website: $PROJECT_STAGING_SITE-$PROJECT_VERSION GitHub: $PROJECT_REPO Commit: $COMMIT_ID -Distribution: $PROJECT_DIST_DIR/$PROJECT_VERSION +Distribution: $PROJECT_DIST_URL Nexus: https://repository.apache.org/content/repositories/orgapachelogging-<FIXME> Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0 diff --git a/.github/release-review-kit.txt b/.github/release-review-kit.txt index 8b096c8..3de18d2 100644 --- a/.github/release-review-kit.txt +++ b/.github/release-review-kit.txt @@ -23,27 +23,23 @@ should work universally for all projects using -----8<-----~( cut here )~-----8<----- # Check out the distribution -wget --cut-dirs=6 \ - --no-host-directories \ - --no-parent \ - --recursive \ - @PROJECT_DIST_DIR@/@PROJECT_VERSION@/ +svn co @PROJECT_DIST_URL@ @PROJECT_ID@-@PROJECT_VERSION@-@COMMIT_ID@ && cd $_ # Verify checksums sha512sum --check *.sha512 # Verify signatures -# -# If you didn't import the KEYS previously, run: -# wget -O - https://downloads.apache.org/logging/KEYS | gpg --import +wget -O - https://downloads.apache.org/logging/KEYS | gpg --import for sigFile in *.asc; do gpg --verify $sigFile; done -# Verify reproducibility (only Linux/MacOS X) +# Extract the sources umask 0022 unzip *-src.zip -d src cd src + +# [Linux/macOS] Verify the build and its reproducibility export NEXUS_REPO=https://repository.apache.org/content/repositories/orgapachelogging-<CHECK> -sh mvnw -Prelease clean verify artifact:compare -Dreference.repo=$NEXUS_REPO +sh mvnw -Prelease verify artifact:compare -Dreference.repo=$NEXUS_REPO -# Run tests only (Windows) -sh mvnw -Prelease clean verify artifact:compare \ No newline at end of file +# [Windows] Verify the build +sh mvnw verify
