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

…template@master networkservicemesh/cmd-template#38 networkservicemesh/cmd-template PR link: networkservicemesh/cmd-template#38 networkservicemesh/cmd-template commit message: commit 1d7dbc2a6e061522571c2d3cf720aab3cc5bf4ed Author: Denis Tingaikin <49399980+denis-tingajkin@users.noreply.github.com> Date: Tue Nov 10 14:06:21 2020 +0700 fix: docker-push may fail && update-integration-k8s-kind should be able to use sdk-version (#38) Signed-off-by: denis-tingajkin <denis.tingajkin@xored.com> Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
networkservicemesh · Nov 10, 2020 · 5bf52a8 · 5bf52a8
1 parent e7bf07b
commit 5bf52a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -168,7 +168,8 @@ 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
@@ -189,8 +190,7 @@ jobs:
     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 +209,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 +223,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 +257,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}}"

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -21,7 +21,9 @@ jobs:
         with:
           go-version: 1.15
       - name: Build ${NAME} image
-        run: docker build . -t "${ORG}/${NAME}:${GITHUB_SHA::8}" --target runtime
+        run: |
+          docker build . -t "${ORG}/${NAME}:${GITHUB_SHA::8}" --target runtime
+          docker build . -t "${ORG}/${NAME}:master" --target runtime
       - name: Push ${NAME} image
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD

diff --git a/.github/workflows/update-integration-k8s-kind.yaml b/.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