From f5ce3d482f8f0756e81cd5e322fc7a5bfa016c03 Mon Sep 17 00:00:00 2001
From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de>
Date: Fri, 19 Apr 2024 20:18:56 +0200
Subject: [PATCH] [ci] always use recursive strategy for git submodules
---
.gitlab-ci.yml | 2 +-
.gitlab-ci/default.yml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c267b3fcc3..2b087014fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
IMAGE_REGISTRY_URL: $CI_REGISTRY/dumux-repositories/dumux-docker-ci
DUMUX_CI_TRIGGER_LECTURE_BRANCH: master
DUMUX_CI_DUNE_LATEST_RELEASE: "2.9"
+ GIT_SUBMODULE_STRATEGY: recursive
# Cases in which to create pipelines at all. The trigger jobs may further
# specify how exactly they should be created in different situations.
@@ -123,7 +124,6 @@ full-dune-master-gcc-cpp-20:
DUMUX_ENABLE_CPPCHECK: "true"
DUMUX_ENABLE_DOXYGEN_BUILD: "true"
DUMUX_CHECK_EXAMPLE_DOCS: "true"
- GIT_SUBMODULE_STRATEGY: recursive
##################################
# additional scheduled pipelines #
diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml
index c09c78c31b..743d01550c 100644
--- a/.gitlab-ci/default.yml
+++ b/.gitlab-ci/default.yml
@@ -33,11 +33,6 @@ configure:
stage: configure
script:
- |
- # remove submodules (may be present due to caching done by gitlab, although this pipeline may not support the submodule)
- rm -rf deps/*
- if [ "${GIT_SUBMODULE_STRATEGY}" == "recursive" ]; then
- git submodule update --init --recursive
- fi
echo "source ${DUNE_OPTS_FILE}" > opts_file.opts
echo "CMAKE_FLAGS=\"\${CMAKE_FLAGS} -DCXX_MAX_STANDARD=${CXX_MAX_STANDARD} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON\"" >> opts_file.opts
- dunecontrol --opts=opts_file.opts --current configure
--
GitLab