diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-08-29 13:43:56 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-30 06:06:16 -0400 |
| commit | 451b1d90cf14e8fb3f12b1b65d8027717093556a (patch) | |
| tree | 5ed35e9d694a8cb5e4ee3e19e6e2c9ba122551ee | |
| parent | 0154bc80b3648af15ef431cf0cf99e3cbbd881f6 (diff) | |
| download | haskell-451b1d90cf14e8fb3f12b1b65d8027717093556a.tar.gz | |
ci: Attempt using normal submodule cloning strategy
We do not use any recursively cloned submodules, and this protects us
from flaky upstream remotes.
Fixes #22121
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ed24d600b..9e5db3bb83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: # Overridden by individual jobs CONFIGURE_ARGS: "" - GIT_SUBMODULE_STRATEGY: "recursive" + GIT_SUBMODULE_STRATEGY: "normal" # Makes ci.sh isolate CABAL_DIR HERMETIC: "YES" diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 906a9ffc81..1a15ea3eb4 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -377,8 +377,8 @@ function cleanup_submodules() { # On Windows submodules can inexplicably get into funky states where git # believes that the submodule is initialized yet its associated repository # is not valid. Avoid failing in this case with the following insanity. - git submodule sync --recursive || git submodule deinit --force --all - git submodule update --init --recursive + git submodule sync || git submodule deinit --force --all + git submodule update --init git submodule foreach git clean -xdf else info "Not cleaning submodules, not in a git repo" |