sdf

Signed-off-by: Mikhail Avramenko <avramenkomihail15@gmail.com>
networkservicemesh · Jul 30, 2021 · edddc8f · edddc8f
1 parent 50f4903
commit edddc8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml
@@ -28,3 +28,4 @@ jobs:
           ENABLED_FOR_MANUAL_CHANGES: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAXIMUM_RETRIES: 25
+          MERGE_METHOD: REBASE
diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml
@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Construct PR message
         run: |
-          PULL_REQUEST_BODY=$(git log --abbrev-commit -1)
-          echo ${PULL_REQUEST_BODY}
+          PULL_REQUEST_BODY=$(git log --pretty='format:%B' -1 | sed '/^$/d;$d')
+          echo "$PULL_REQUEST_BODY"
           echo "PULL_REQUEST_BODY<<EOF" >> $GITHUB_ENV
-          echo "${PULL_REQUEST_BODY}" >> $GITHUB_ENV
+          echo "$PULL_REQUEST_BODY" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
       - name: pull-request-action
         uses: vsoch/pull-request-action@1.0.12

diff --git a/.github/workflows/update-dependent-repositories-gomod.yaml b/.github/workflows/update-dependent-repositories-gomod.yaml
@@ -37,19 +37,19 @@ 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:
           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" >> /tmp/commit-message
-          echo "" >> /tmp/commit-message
           echo "PR link: https://github.com/${{ github.repository }}/pull/${{ steps.findPr.outputs.pr }}" >> /tmp/commit-message
           echo "" >> /tmp/commit-message
-          echo "Commit message:" >> /tmp/commit-message
-          git log --abbrev-commit -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