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 ac86920e12a3d6b259b2a39f95dba54420adc396
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Wed Sep 6 12:22:31 2023 +0200

    Fix commit ID passed to `generate-email.sh`
---
 .github/workflows/deploy-release-reusable.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-release-reusable.yml 
b/.github/workflows/deploy-release-reusable.yml
index 86e2772..1052717 100644
--- a/.github/workflows/deploy-release-reusable.yml
+++ b/.github/workflows/deploy-release-reusable.yml
@@ -89,7 +89,6 @@ jobs:
 
       - name: Set the Maven `revision` property
         run: |
-          set -x
           export REVISION=$(./mvnw \
             --non-recursive --quiet --batch-mode \
             -DforceStdout=true \
@@ -112,7 +111,6 @@ jobs:
 
       - name: Release changelog
         run: |
-          set -x
           ./mvnw \
             --non-recursive --batch-mode --errors --no-transfer-progress \
             -P changelog-release
@@ -194,8 +192,9 @@ jobs:
           find . -name "${DIST_FILENAME_PREFIX}*" -type f -print0 | xargs -0 
-r svn delete
 
           # Generate emails
+          export COMMIT_ID=$(git rev-parse HEAD)
           for EMAIL_TYPE in vote announce; do
-            "$GITHUB_WORKSPACE/.github/generate-email.sh" $EMAIL_TYPE 
$PROJECT_VERSION $GITHUB_SHA \
+            "$GITHUB_WORKSPACE/.github/generate-email.sh" $EMAIL_TYPE 
$PROJECT_VERSION $COMMIT_ID \
               > "${DIST_FILENAME_VERSIONED_PREFIX}-email-${EMAIL_TYPE}.txt"
           done
 

Reply via email to