Self code review

Signed-off-by: Denis Tingajkin <denis.tingajkin@xored.com>
networkservicemesh · Nov 1, 2020 · 74d81c4 · 74d81c4
1 parent 34c3301
commit 74d81c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -209,12 +209,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository != 'networkservicemesh/cmd-template'
     steps:
-      - name: Checkout integration-k8s-kind
+      - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          path: ${{ github.repository }}
-          repository: ${{ github.repository }}
-          token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
       - name: Find merged PR
         uses: jwalton/gh-find-current-pr@v1
         id: findPr
@@ -240,11 +236,15 @@ jobs:
       - uses: actions/setup-go@v1
         with:
           go-version: 1.13.4
+      - uses: benjlevesque/short-sha@v1.1
+        id: short-sha
+        with:
+          length: 8
       - name: Find and Replace version
         uses: jacobtomlinson/gha-find-replace@master
         with:
           find: "${{ github.event.repository.name }}:.*\n"
-          replace: "${{ github.event.repository.name }}:${GITHUB_SHA::8}"
+          replace: "${{ github.event.repository.name }}:${{ steps.short-sha.outputs.sha }}\n"
       - name: Push update to the integration-k8s-kind
         working-directory: networkservicemesh/integration-k8s-kind
         run: |
@@ -265,4 +265,7 @@ jobs:
           git config --global user.name "NSMBot"
           git commit -s -F /tmp/commit-message
           git checkout -b update/"${branchName}"
-          git push -f origin update/"${branchName}"
+          while [ git push -f origin update/"${branchName}" ]; do
+            git fetch origin update/"${branchName}"
+            git rebase origin/update/"${branchName}"
+          done
diff --git a/.github/workflows/update-integration-k8s-kind.yaml b/.github/workflows/update-integration-k8s-kind.yaml
@@ -11,12 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository != 'networkservicemesh/cmd-template'
     steps:
-      - name: Checkout integration-k8s-kind
+      - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          path: ${{ github.repository }}
-          repository: ${{ github.repository }}
-          token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
       - name: Find merged PR
         uses: jwalton/gh-find-current-pr@v1
         id: findPr
@@ -42,11 +38,15 @@ jobs:
       - uses: actions/setup-go@v1
         with:
           go-version: 1.13.4
+      - uses: benjlevesque/short-sha@v1.1
+        id: short-sha
+        with:
+          length: 8
       - name: Find and Replace version
         uses: jacobtomlinson/gha-find-replace@master
         with:
           find: "${{ github.event.repository.name }}:.*\n"
-          replace: "${{ github.event.repository.name }}:${GITHUB_SHA::8}"
+          replace: "${{ github.event.repository.name }}:${{ steps.short-sha.outputs.sha }}\n"
       - name: Push update to the integration-k8s-kind
         working-directory: networkservicemesh/integration-k8s-kind
         run: |
@@ -67,4 +67,8 @@ jobs:
           git config --global user.name "NSMBot"
           git commit -s -F /tmp/commit-message
           git checkout -b update/"${branchName}"
-          git push -f origin update/"${branchName}"
+          while [ git push -f origin update/"${branchName}" ]; do
+            git fetch origin update/"${branchName}"
+            git rebase origin/update/"${branchName}"
+          done
+