Non recursive submodules, and --merge flag for submodule update

2023-10-24 15:12:40 +10:00
parent 5a3315370b
commit c08e147199
1 changed files with 2 additions and 2 deletions
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -7,9 +7,9 @@ workflow:

 variables:
  GIT_STRATEGY: clone
-  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: normal
  GIT_SUBMODULE_FORCE_HTTPS: "true"
-  GIT_SUBMODULE_UPDATE_FLAGS: --remote
+  GIT_SUBMODULE_UPDATE_FLAGS: --remote --merge

 stages:
  - gen_mech