From 54d48feb2d31cbbd22b1a76eaadda50cd4806063 Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Fri, 10 Feb 2023 11:49:04 +0100 Subject: [PATCH 1/2] added hook to automatically update submodules after checkout --- clone-submodules-no-privlibs.sh | 3 +++ hooks/post-checkout | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100755 hooks/post-checkout diff --git a/clone-submodules-no-privlibs.sh b/clone-submodules-no-privlibs.sh index ae08a9ce..48d34bc2 100755 --- a/clone-submodules-no-privlibs.sh +++ b/clone-submodules-no-privlibs.sh @@ -1,3 +1,6 @@ #!/bin/bash +root="$(pwd)" +ln -s "$root/hooks" "$root/.git/hooks" + git submodule update --init fsfw thirdparty/rapidcsv thirdparty/lwgps thirdparty/json diff --git a/hooks/post-checkout b/hooks/post-checkout new file mode 100755 index 00000000..bfddad44 --- /dev/null +++ b/hooks/post-checkout @@ -0,0 +1,6 @@ +#!/bin/bash +# +# update submodules after checkout + +git submodule init +git submodule update From 8fbb05832227ce0f98c60251845997336e8737e2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 17 Feb 2023 12:33:44 +0100 Subject: [PATCH 2/2] add git post checkout hook --- CHANGELOG.md | 2 ++ fsfw | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5db00eb..e90ff576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ eive-tmtc: v2.12.7 ## Added +- git post checkout hook which initializes and updates the submodules + automatically. - In case the ACS Controller does recognize more than one RW to be invalid and therefore not available, it does not perform pointing control but aborts shortly after `sensorProcessing`. If the problem persits for 5 ACS cycles, the `MULTIPLE_RW_INVALID` event is triggered, which invokes the diff --git a/fsfw b/fsfw index a6d707a7..be015b4c 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit a6d707a7db589136ac2bd917cd8b3a3e2c16a0e4 +Subproject commit be015b4c669995dc55bc316b006699be8542d941