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 b2a9a4b  More Subversion script fixes
b2a9a4b is described below

commit b2a9a4b3f8238441459063212cd5ffcfb0145ce3
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Jul 24 23:57:12 2023 +0200

    More Subversion script fixes
---
 .github/workflows/build.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 38d027a..a73523a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -182,13 +182,17 @@ jobs:
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
             --non-recursive -P distribution
-          export DIST_BASENAME="apache-log4j-tools"
-          export DIST_FILEPATH="/tmp/${DIST_BASENAME}-${PROJECT_VERSION}.zip"
+          export DIST_FILENAME_PREFIX="apache-log4j-tools"
+          export DIST_FILENAME="${DIST_FILENAME_PREFIX}-${PROJECT_VERSION}.zip"
+          export DIST_FILEPATH="/tmp/${DIST_FILENAME}"
           mv "target/dist.zip" "$DIST_FILEPATH"
           gpg --armor --detach-sign --yes --pinentry-mode error 
"$DIST_FILEPATH"
           sha512sum "$DIST_FILEPATH" > "$DIST_FILEPATH.sha512"
-          echo "DIST_BASENAME=$DIST_BASENAME" >> $GITHUB_ENV
-          echo "DIST_FILEPATH=$DIST_FILEPATH" >> $GITHUB_ENV
+          cat >> $GITHUB_ENV << EOF
+          DIST_FILENAME_PREFIX=$DIST_FILENAME_PREFIX
+          DIST_FILENAME=$DIST_FILENAME
+          DIST_FILEPATH=$DIST_FILEPATH
+          EOF
 
       - name: Upload to Subversion (RELEASE)
         if: startsWith(github.ref, 'refs/heads/release/')
@@ -201,10 +205,10 @@ jobs:
             https://dist.apache.org/repos/dist/dev/logging/log4j \
             "$SVN_DIR"
           cd "$SVN_DIR"
-          find . -name "${DIST_BASENAME}-*" -type f -print0 | xargs -0 -r svn 
delete
+          find . -name "${DIST_FILENAME_PREFIX}-*" -type f -print0 | xargs -0 
-r svn delete
           cp "${DIST_FILEPATH}"* .
-          svn add "${DIST_FILEPATH}"*
-          svn commit -m "Added *fake* \`${DIST_BASENAME}\` artifacts for 
release \`${PROJECT_VERSION}\`"
+          svn add "${DIST_FILENAME}"*
+          svn commit -m "Added *fake* \`${DIST_FILENAME_PREFIX}\` artifacts 
for release \`${PROJECT_VERSION}\`"
         env:
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}

Reply via email to