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

…template@master networkservicemesh/cmd-template#15 networkservicemesh/cmd-template PR link: networkservicemesh/cmd-template#15 networkservicemesh/cmd-template commit message: commit f44fe58e4206ec0bc8138a988ff7b59100e0a3ca Author: Denis Tingaikin <[email protected]> Date: Mon Sep 7 14:22:01 2020 +0700 Allow for cmd-repos have deps on sdk-vppagent, sdk-k8s, sdk-sriov (#15) Signed-off-by: denis-tingajkin <[email protected]> Signed-off-by: NSMBot <[email protected]>
networkservicemesh · Sep 7, 2020 · f7ad1f0 · f7ad1f0
1 parent 0a203f2
commit f7ad1f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -89,7 +89,7 @@ jobs:
       - name: Restrict dependencies on github.com/networkservicemesh/*
         run: |
           for i in $(grep github.com/networkservicemesh/ go.mod |grep -v '^module' | sed 's;.*\(github.com\/networkservicemesh\/[a-zA-z\/]*\).*;\1;g' | sort -u);do
-            if [ "${i}" != "github.com/networkservicemesh/sdk" ] && [ "${i}" != "github.com/networkservicemesh/api" ]; then
+          if [ "${i}" != "github.com/networkservicemesh/sdk-vppagent" ] && [ "${i}" != "github.com/networkservicemesh/sdk" ] && [ "${i}" != "github.com/networkservicemesh/api" ] && [ "${i}" != "github.com/networkservicemesh/sdk-k8s" && [ "${i}" != "github.com/networkservicemesh/sdk-sriov" ]]; then
               echo Dependency on "${i}" is forbidden
               exit 1
             fi
@@ -158,7 +158,7 @@ jobs:
       - name: Build container
         run: docker build .
       - name: Run tests
-        run: docker run --rm $(docker build -q . --target test)
+        run: docker run --privileged  --rm $(docker build -q . --target test)
       - name: Find merged PR
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         uses: jwalton/gh-find-current-pr@v1

diff --git a/.github/workflows/update-cmd-repositories.yaml b/.github/workflows/update-cmd-repositories.yaml
@@ -56,6 +56,11 @@ jobs:
           git diff cmd_template/master -R | git apply
           git add $(git ls-tree --name-only -r cmd_template/master | grep ".*\.yml\|.*\.yaml\|.*\.md\|.*\.txt\|.*.\.conf")
           git reset -- $(cat exclude.patch.conf)
+          git reset -- update-cmd-repositories.yaml
+          git reset -- exclude.patch.conf
+          if ! [ -n "$(git diff --cached --exit-code)" ]; then
+            exit 0;
+          fi
           git commit -s -F /tmp/commit-message
           git checkout -b update/${{ github.repository }}
           git push -f origin update/${{ github.repository }}