From 5b186d25c0315bf973daf5660bf883d3824ceaaf Mon Sep 17 00:00:00 2001 From: Martin Bruzina Date: Sat, 4 Dec 2021 08:29:37 +0100 Subject: [PATCH 1/2] fix: add misssing git submodules update --- tests/update-repo.bats | 6 +++++- tools/update-repo | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/update-repo.bats b/tests/update-repo.bats index 1767bc0..8547bed 100644 --- a/tests/update-repo.bats +++ b/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 diff --git a/tools/update-repo b/tools/update-repo index 1541417..e37b271 100755 --- a/tools/update-repo +++ b/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 From e3039fe18ade4a6ae805cb3f6f16c1284c2653f3 Mon Sep 17 00:00:00 2001 From: Martin Bruzina Date: Sat, 4 Dec 2021 08:31:07 +0100 Subject: [PATCH 2/2] ci: fix ci grep warning by replacing busybox grep with full featured one --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d54633..8fe6435 100644 --- a/.gitlab-ci.yml +++ b/.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: