Skip to content
Snippets Groups Projects
Commit f5ce3d48 authored by Mathis Kelm's avatar Mathis Kelm
Browse files

[ci] always use recursive strategy for git submodules

parent b6548a0e
No related branches found
No related tags found
1 merge request!3772[cmake] don't include gridformat without c++20
Pipeline #42572 passed
+3
...@@ -9,6 +9,7 @@ variables: ...@@ -9,6 +9,7 @@ variables:
IMAGE_REGISTRY_URL: $CI_REGISTRY/dumux-repositories/dumux-docker-ci IMAGE_REGISTRY_URL: $CI_REGISTRY/dumux-repositories/dumux-docker-ci
DUMUX_CI_TRIGGER_LECTURE_BRANCH: master DUMUX_CI_TRIGGER_LECTURE_BRANCH: master
DUMUX_CI_DUNE_LATEST_RELEASE: "2.9" DUMUX_CI_DUNE_LATEST_RELEASE: "2.9"
GIT_SUBMODULE_STRATEGY: recursive
# Cases in which to create pipelines at all. The trigger jobs may further # Cases in which to create pipelines at all. The trigger jobs may further
# specify how exactly they should be created in different situations. # specify how exactly they should be created in different situations.
...@@ -123,7 +124,6 @@ full-dune-master-gcc-cpp-20: ...@@ -123,7 +124,6 @@ full-dune-master-gcc-cpp-20:
DUMUX_ENABLE_CPPCHECK: "true" DUMUX_ENABLE_CPPCHECK: "true"
DUMUX_ENABLE_DOXYGEN_BUILD: "true" DUMUX_ENABLE_DOXYGEN_BUILD: "true"
DUMUX_CHECK_EXAMPLE_DOCS: "true" DUMUX_CHECK_EXAMPLE_DOCS: "true"
GIT_SUBMODULE_STRATEGY: recursive
################################## ##################################
# additional scheduled pipelines # # additional scheduled pipelines #
......
...@@ -33,11 +33,6 @@ configure: ...@@ -33,11 +33,6 @@ configure:
stage: configure stage: configure
script: 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 "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 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 - dunecontrol --opts=opts_file.opts --current configure
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment