Merge branch 'bats-errata' into 'main'

Bats errata - add submodules update and fix CI grep warning

See merge request xebis/repository-template!41

.gitlab-ci.yml

@@ -15,7 +15,7 @@ lint:
   stage: validate
   before_script:
     - *default_before_script
-    - apk add bash git npm py-pip python3-dev shellcheck shfmt
+    - apk add bash git grep npm py-pip python3-dev shellcheck shfmt
     - pip install gitlint pre-commit yamllint
     - npm install -g markdownlint-cli
   script:

tests/update-repo.bats

@@ -12,7 +12,11 @@ setup() {
 
 @test "tools/update-repo basic test" {
     function git() {
-        echo '.'
+        if [ "$1" = 'rev-parse' ]; then
+            echo '.'
+        else
+            echo -n
+        fi
     }
     export -f git
 

tools/update-repo

@@ -12,5 +12,6 @@ pushd "$REPO_DIR"
 # Update repository dependencies
 pre-commit autoupdate
 pre-commit gc
+git submodule update --remote --merge
 
 popd