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

…template@master networkservicemesh/cmd-template#28 networkservicemesh/cmd-template PR link: networkservicemesh/cmd-template#28 networkservicemesh/cmd-template commit message: commit 4b6b3f1fe3695bc7023e16814bdc3ddb2ce2a920 Author: Denis Tingaikin <[email protected]> Date: Wed Oct 28 23:28:23 2020 +0700 Add default .templateignore file in case of subscribing exist repository (#28) Signed-off-by: Denis Tingajkin <[email protected]> Signed-off-by: NSMBot <[email protected]>
networkservicemesh · Oct 28, 2020 · 92772da · 92772da
1 parent 42f5883
commit 92772da
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/update-cmd-repositories.yaml b/.github/workflows/update-cmd-repositories.yaml
@@ -55,12 +55,14 @@ jobs:
           git fetch cmd_template
           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")
-          if ! [ "$(git restore --staged -- .templateignore)" ]; then
+          {
+            git restore --staged -- .templateignore &&
             git restore -- .templateignore
-          fi
-          if ! [ "$(git restore --staged -- $(cat .templateignore))" ]; then
-            git restore -- $(cat .templateignore)
-          fi
+          } || {
+            git add .templateignore
+          }
+          git restore --staged -- $(cat .templateignore)
+          git restore -- $(cat .templateignore)
           if ! [ -n "$(git diff --cached --exit-code)" ]; then
             exit 0;
           fi