Update common CI files to latest version from networkservicemesh/cmd-…

…template@master networkservicemesh/cmd-template#42

networkservicemesh/cmd-template PR link: networkservicemesh/cmd-template#42

networkservicemesh/cmd-template commit message:
commit 7a5cfd0c9aa10254527921ea97e3156877c166e0
Author: Denis Tingaikin <49399980+denis-tingajkin@users.noreply.github.com>
Date:   Wed Nov 11 02:24:49 2020 +0700

    fix docker push job from ci.yaml (#42)

    Signed-off-by: Denis Tingajkin <denis.tingajkin@xored.com>

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>

.github/workflows/ci.yaml

@@ -168,29 +168,31 @@ jobs:
       CGO_ENABLED: 0
       NAME: ${{ github.event.repository.name }}
     needs:
-      - automerge
+      - build
+      - docker
     if: github.actor == 'nsmbot' && github.base_ref == 'master' && github.event_name == 'pull_request' && github.repository != 'networkservicemesh/cmd-template'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
           go-version: 1.15
-      - name: Build ${NAME} image
+      - name: Build ${NAME}:${GITHUB_SHA::8} image
         run: docker build . -t "${ORG}/${NAME}:${GITHUB_SHA::8}" --target runtime
-      - name: Push ${NAME} image
+      - name: Build ${NAME}:latest image
+        run: docker build . -t "${ORG}/${NAME}" --target runtime
+      - name: Push ${NAME} images
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
           docker push "${ORG}/${NAME}:${GITHUB_SHA::8}"
           docker image rm "${ORG}/${NAME}:${GITHUB_SHA::8}"
-          docker push "${ORG}/${NAME}:latest"
-          docker image rm "${ORG}/${NAME}:latest"
+          docker push "${ORG}/${NAME}"
+          docker image rm "${ORG}/${NAME}"
 
   automerge:
     name: automerge
     runs-on: ubuntu-latest
     needs:
-      - build
-      - docker
+      - update-integration-k8s-kind
     if: github.actor == 'nsmbot' && github.base_ref == 'master' && github.event_name == 'pull_request'
     steps:
       - name: Check out the code
@@ -209,7 +211,7 @@ jobs:
 
   update-integration-k8s-kind:
     needs:
-      - automerge
+      - pushImage
     name: Update integration-k8s-kind
     runs-on: ubuntu-latest
     if: github.repository != 'networkservicemesh/cmd-template' && github.actor == 'nsmbot' && github.base_ref == 'master' && github.event_name == 'pull_request'
@@ -223,7 +225,7 @@ jobs:
       - name: Create commit message
         working-directory: ${{ github.repository }}
         run: |
-          echo "Update application version to latest version from ${{ github.repository }}@master ${{ github.repository }}#${{ github.event.number }}" >> /tmp/commit-message
+          echo "Update application version to latest version from ${{ github.repository }}@master ${{ github.repository }}#${{ github.event.number }}" > /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
@@ -257,7 +259,7 @@ jobs:
           fi
           diff=$(git diff --name-only)
           branchName="${{ github.event.repository.name }}"
-          if  [ $(grep "go.mod" <<< "${diff}") && $(grep "" -c <<< "${diff}") == 1 ]; then
+          if [[ $(grep "go.mod" <<< "${diff}") && $(grep "" -c <<< "${diff}") == 2 ]]; then
             sdkPattern="github.com\/networkservicemesh\/sdk "
             sdkVersion=$(grep --regexp "${sdkPattern}" go.mod)
             branchName="${sdkVersion:${#sdkPattern}}"

.github/workflows/docker-push.yaml

@@ -20,12 +20,14 @@ jobs:
       - uses: actions/setup-go@v1
         with:
           go-version: 1.15
-      - name: Build ${NAME} image
+      - name: Build ${NAME}:${GITHUB_SHA::8} image
         run: docker build . -t "${ORG}/${NAME}:${GITHUB_SHA::8}" --target runtime
-      - name: Push ${NAME} image
+      - name: Build ${NAME}:latest image
+        run: docker build . -t "${ORG}/${NAME}" --target runtime
+      - name: Push ${NAME} images
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
           docker push "${ORG}/${NAME}:${GITHUB_SHA::8}"
           docker image rm "${ORG}/${NAME}:${GITHUB_SHA::8}"
-          docker push "${ORG}/${NAME}:latest"
-          docker image rm "${ORG}/${NAME}:latest"
+          docker push "${ORG}/${NAME}"
+          docker image rm "${ORG}/${NAME}"

.github/workflows/update-integration-k8s-kind.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Create commit message
         working-directory: ${{ github.repository }}
         run: |
-          echo "Update application version to latest version from ${{ github.repository }}@master ${{ github.repository }}#${{ github.event.number }}" >> /tmp/commit-message
+          echo "Update application version to latest version from ${{ github.repository }}@master ${{ github.repository }}#${{ github.event.number }}" > /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
@@ -54,7 +54,7 @@ jobs:
           fi
           diff=$(git diff --name-only)
           branchName="${{ github.event.repository.name }}"
-          if  [ $(grep "go.mod" <<< "${diff}") && $(grep "" -c <<< "${diff}") == 1 ]; then
+          if [[ $(grep "go.mod" <<< "${diff}") && $(grep "" -c <<< "${diff}") == 2 ]]; then
             sdkPattern="github.com\/networkservicemesh\/sdk "
             sdkVersion=$(grep --regexp "${sdkPattern}" go.mod)
             branchName="${sdkVersion:${#sdkPattern}}"
@@ -65,7 +65,6 @@ jobs:
               echo Branch update/"${branchName}" is already deleted
             }
           fi;
-          fi;
           git config --global user.email "nsmbot@networkservicmesh.io"
           git config --global user.name "NSMBot"
           git commit -s -F /tmp/commit-message