Merge pull request #226 from Mixaster995/fix/nsm-bot-pr-message

Changed nsmbot message
networkservicemesh · Aug 11, 2021 · 57b598b · 57b598b
2 parents 6146fa4 + c41d676
commit 57b598b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git 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-dependent-repositories-gomod.yaml b/.github/workflows/update-dependent-repositories-gomod.yaml
@@ -30,19 +30,20 @@ jobs:
           repository: ${{ github.repository }}
           token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
       - name: Find merged PR
-        uses: jwalton/gh-find-current-pr@v1
+        uses: jwalton/gh-find-current-pr@v1.0.2
         id: findPr
         with:
+          sha: ${{ github.sha }}
           github-token: ${{ github.token }}
       - name: Create commit message
         working-directory: ${{ github.repository }}
         run: |
-          echo "Update go.mod and go.sum to latest version from ${{ github.repository }}@main ${{ github.repository }}#${{ steps.findPr.outputs.pr }}" >> /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/${{ steps.findPr.outputs.pr }}" >> /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