From 52f72b929656f77baea7e54d89b5ecaad80c067a Mon Sep 17 00:00:00 2001 From: Fabian Schiebel Date: Sun, 16 Mar 2025 20:39:45 +0100 Subject: [PATCH 1/3] Fix init-submodules-release.sh --- utils/init-submodules-release.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/utils/init-submodules-release.sh b/utils/init-submodules-release.sh index 159e2f6201..2b02ec5ad9 100755 --- a/utils/init-submodules-release.sh +++ b/utils/init-submodules-release.sh @@ -3,13 +3,17 @@ source ./safeCommandsSet.sh if git submodule status 2>&1 | grep -iq "fatal: Not a git repository (or any of the parent directories): .git"; then + safe_cd "$(dirname "$0")"/../external/ -git clone git@github.com:google/googletest.git -safe_cd googletest/ -git checkout release-1.8.0 + +git clone --no-checkout https://github.com/nlohmann/json.git +safe_cd json/ +git checkout v3.11.3 safe_cd - -git clone git@github.com:nlohmann/json.git + +git clone --no-checkout https://github.com/pboettch/json-schema-validator.git safe_cd json/ -git checkout v3.4.0 +git checkout 2.3.0 safe_cd - + fi From 073308e0b205deb7c6e7a4d807a98a202810a0b9 Mon Sep 17 00:00:00 2001 From: Sriteja Kummita Date: Mon, 24 Mar 2025 09:18:07 +0100 Subject: [PATCH 2/3] default to submodule update in the helper shell script --- utils/init-submodules-release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/init-submodules-release.sh b/utils/init-submodules-release.sh index 2b02ec5ad9..4850592d60 100755 --- a/utils/init-submodules-release.sh +++ b/utils/init-submodules-release.sh @@ -16,4 +16,5 @@ safe_cd json/ git checkout 2.3.0 safe_cd - -fi +else git submodule update --init; +fi \ No newline at end of file From 650cab43a5118360cb419099c4cdf03214dc0e71 Mon Sep 17 00:00:00 2001 From: Sriteja Kummita Date: Mon, 24 Mar 2025 09:35:24 +0100 Subject: [PATCH 3/3] Fix pre-commit --- utils/init-submodules-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/init-submodules-release.sh b/utils/init-submodules-release.sh index 4850592d60..31e4c9f3fd 100755 --- a/utils/init-submodules-release.sh +++ b/utils/init-submodules-release.sh @@ -17,4 +17,4 @@ git checkout 2.3.0 safe_cd - else git submodule update --init; -fi \ No newline at end of file +fi