From 418c9eb56d301d5c6d22d40ed20a246d9f9cf439 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 11 Aug 2021 07:02:20 +0000 Subject: [PATCH] Sync files with networkservicemesh/cmd-template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR syncs files with https://github.com/networkservicemesh/cmd-template Revision: https://github.com/networkservicemesh/cmd-template/commits/77bd45f89bbe55a65245c2a5828b76fb9d9bae89 commit 77bd45f89bbe55a65245c2a5828b76fb9d9bae89 Author: Авраменко Михаил Date: Wed Aug 11 14:01:07 2021 +0700 Updated nsmbot message (#79) * Updated nsmbot message Signed-off-by: Mikhail Avramenko * changed merge method Signed-off-by: Mikhail Avramenko Signed-off-by: NSMBot --- .github/workflows/pr-for-updates.yaml | 8 +++++--- .github/workflows/update-deployments.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr-for-updates.yaml b/.github/workflows/pr-for-updates.yaml index d09d498d..c33831da 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<> $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 db805e08..51aba33c 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