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
commit 28d6126a5fa2814eeece1b0b04f6980c898b9e5d Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Jul 25 10:25:45 2023 +0200 More CI fixes --- .github/workflows/build.yml | 43 +++++++++++++++++-------------------------- RELEASING.adoc | 4 +--- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a73523a..ed92818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,40 +197,31 @@ jobs: - name: Upload to Subversion (RELEASE) if: startsWith(github.ref, 'refs/heads/release/') run: | - SVN_DIR="/tmp/svn-repo" + + # Checkout the SVN repository + export SVN_DIR="/tmp/svn-repo" svn co \ --depth files \ - --username "$SVN_USERNAME" \ - --password "$SVN_PASSWORD" \ https://dist.apache.org/repos/dist/dev/logging/log4j \ "$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 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}"* - svn commit -m "Added *fake* \`${DIST_FILENAME_PREFIX}\` artifacts for release \`${PROJECT_VERSION}\`" + + # Commit changes + svn commit \ + --username "$SVN_USERNAME" \ + --password "$SVN_PASSWORD" \ + -m "Added *fake* \`${DIST_FILENAME_PREFIX}\` artifacts for release \`${PROJECT_VERSION}\`" + env: SVN_USERNAME: ${{ secrets.SVN_USERNAME }} SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} - - - name: Generate vote email (RELEASE) - if: startsWith(github.ref, 'refs/heads/release/') - run: | - ./.github/generate-email.sh vote $PROJECT_VERSION $GITHUB_SHA \ - > /tmp/email-vote.txt - - - name: Generate announcement email (RELEASE) - if: startsWith(github.ref, 'refs/heads/release/') - run: | - ./.github/generate-email.sh announce $PROJECT_VERSION $GITHUB_SHA \ - > /tmp/email-announce.txt - - - name: Upload to GitHub (RELEASE) - if: startsWith(github.ref, 'refs/heads/release/') - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # 3.1.2 - with: - name: Distribution - path: | - ${{ env.DIST_FILEPATH }}* - /tmp/email-*.txt - if-no-files-found: error diff --git a/RELEASING.adoc b/RELEASING.adoc index 11b61ac..eb9dd7b 100644 --- a/RELEASING.adoc +++ b/RELEASING.adoc @@ -34,9 +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 -... GitHub as workflow artifacts +.. *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 + If not, commit necessary fixes, push, and repeat.
