Skip to content
Snippets Groups Projects
Commit 27aabdd8 authored by Dominic Kempf's avatar Dominic Kempf
Browse files

Merge remote-tracking branch 'origin/update-submodules-ci-support' into feature/stokes-3d-tests

parents b67b9e76 d377c20d
No related branches found
No related tags found
No related merge requests found
...@@ -6,12 +6,13 @@ variables: ...@@ -6,12 +6,13 @@ variables:
before_script: before_script:
- echo "Running make concurrently with $(nproc) cores, where possibly" - echo "Running make concurrently with $(nproc) cores, where possibly"
# make sure we can update submodules and apply the patches
- git submodule foreach --recursive git reset --hard HEAD
- git submodule foreach --recursive git clean -fdx
# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148 # work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --init --recursive - git submodule update --init --recursive
# end workaround # end workaround
# make sure we can apply the patches
- git submodule foreach --recursive git reset --hard HEAD
- patches/apply_patches.sh - patches/apply_patches.sh
# detect number of processors, but make sure never to run with -j"", as the # detect number of processors, but make sure never to run with -j"", as the
# build host would likely run out of memory # build host would likely run out of memory
......
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