From b806e46f2987d82f10107c932192a19a1df6a195 Mon Sep 17 00:00:00 2001 From: Pk11 Date: Wed, 17 Mar 2021 18:03:44 -0500 Subject: [PATCH] Properly fix commit messages * bullet testing --- .github/workflows/build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad2eb38..0bca089 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,10 +55,10 @@ jobs: echo ::set-output name=commit_hash::$(git log --format=%h -1) # Webhook info - echo ::set-output name=author_name::$(git log -1 "$GITHUB_SHA" --pretty="%aN") - echo ::set-output name=committer_name::$(git log -1 "$GITHUB_SHA" --pretty="%cN") - echo ::set-output name=commit_subject::$(git log -1 "$GITHUB_SHA" --pretty="%s") - echo ::set-output name=commit_message::$(git log -1 "$GITHUB_SHA" --pretty="%B") + echo "::set-output name=author_name::$(git log -1 $GITHUB_SHA --pretty=%aN)" + echo "::set-output name=committer_name::$(git log -1 $GITHUB_SHA --pretty=%cN)" + echo "::set-output name=commit_subject::$(git log -1 $GITHUB_SHA --pretty=%s)" + echo "::set-output name=commit_message::$(git log -1 $GITHUB_SHA --pretty=%b)" - name: Publish build to GH Actions uses: actions/upload-artifact@v2 with: @@ -75,6 +75,7 @@ jobs: COMMIT_TAG: ${{ needs.build.outputs.commit_tag }} COMMIT_HASH: ${{ needs.build.outputs.commit_hash }} AUTHOR_NAME: ${{ needs.build.outputs.author_name }} + COMMIT_SUBJECT: ${{ needs.build.outputs.commit_subject }} COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }} outputs: current_date: ${{ steps.commit.outputs.current_date }} @@ -124,7 +125,7 @@ jobs: AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}" CONTENT_TYPE="Content-Type: application/json" API_URL="https://api.github.com/repos/Universal-Team/extras/releases" - RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"Universal-Updater | $COMMIT_HASH\", \"body\": \"$AUTHOR_NAME - $COMMIT_MESSAGE\", \"prerelease\": true}" + RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"Universal-Updater | $COMMIT_HASH\", \"body\": \"$AUTHOR_NAME - COMMIT_SUBJECT\n\n$COMMIT_MESSAGE\", \"prerelease\": true}" RESPONSE=$(curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_TYPE" "$API_URL" -d "$RELEASE_INFO")