diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2d5a5fa7..bfb732bc 100644 --- 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 index 5a781a1e..f69566b2 100644 --- 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 }}