From 95d25aba1fc1875840e25c05a9a8b2d578ee64a7 Mon Sep 17 00:00:00 2001
From: Mikhail Avramenko <avramenkomihail15@gmail.com>
Date: Mon, 2 Aug 2021 13:37:35 +0700
Subject: [PATCH] Updated nsmbot message

Signed-off-by: Mikhail Avramenko <avramenkomihail15@gmail.com>
---
 .github/workflows/automerge.yaml          |  1 +
 .github/workflows/pr-for-updates.yaml     |  8 +++++---
 .github/workflows/update-deployments.yaml | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml
index 732a3d5..81998ca 100644
--- a/.github/workflows/automerge.yaml
+++ b/.github/workflows/automerge.yaml
@@ -27,3 +27,4 @@ jobs:
           GITHUB_LOGIN: nsmbot
           ENABLED_FOR_MANUAL_CHANGES: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_METHOD: REBASE
diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml
index d09d498..c33831d 100644
--- a/.github/workflows/pr-for-updates.yaml
+++ b/.github/workflows/pr-for-updates.yaml
@@ -12,9 +12,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Construct PR message
         run: |
-          PULL_REQUEST_BODY=$(git log -1)
-          echo ${PULL_REQUEST_BODY}
-          echo PULL_REQUEST_BODY=${PULL_REQUEST_BODY} >> $GITHUB_ENV
+          PULL_REQUEST_BODY=$(git log --pretty='format:%B' -1 | sed '/^$/d;$d' | sed 's/#/# /g')
+          echo "$PULL_REQUEST_BODY"
+          echo "PULL_REQUEST_BODY<<EOF" >> $GITHUB_ENV
+          echo "$PULL_REQUEST_BODY" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
       - name: pull-request-action
         uses: vsoch/pull-request-action@1.0.12
         env:
diff --git a/.github/workflows/update-deployments.yaml b/.github/workflows/update-deployments.yaml
index db805e0..51aba33 100644
--- a/.github/workflows/update-deployments.yaml
+++ b/.github/workflows/update-deployments.yaml
@@ -34,12 +34,12 @@ jobs:
       - name: Create commit message
         working-directory: ${{ github.repository }}
         run: |
-          echo "Update application version to latest version from ${{ github.repository }}@main ${{ github.repository }}#${{ github.event.number }}" > /tmp/commit-message
+          echo "Update go.mod and go.sum to latest version from ${{ github.repository }}@main" >> /tmp/commit-message
+          echo "PR link: https://github.com/${{ github.repository }}/pull/${{ steps.findPr.outputs.pr }}" >> /tmp/commit-message
           echo "" >> /tmp/commit-message
-          echo "${{ github.repository }} PR link: https://github.com/${{ github.repository }}/pull/${{ github.event.number }}" >> /tmp/commit-message
-          echo "" >> /tmp/commit-message
-          echo "${{ github.repository }} commit message:" >> /tmp/commit-message
-          git log -1 >> /tmp/commit-message
+          LOG_MSG=$(git log --date=iso --pretty='format:Commit: %h%nAuthor: %an%nDate: %ad%nMessage:%n  - %B%n' -1 | sed '/^$/d;$d')
+          for((i=2;i<=18;i+=2)); do n=$(printf '%*s' $((i+2))) m=$(printf '%*s' $i) LOG_MSG=$(echo "$LOG_MSG" | tr '\n' '|' | sed "s/${m}-/${n}-/2g" | tr '|' '\n'); done
+          echo "$LOG_MSG" >> /tmp/commit-message
           echo "Commit Message:"
           cat /tmp/commit-message
       - name: Find and Replace version