diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-19 10:57:11 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 16:52:13 -0500 |
| commit | a3c6f5e4f16301cb4b9bb1629108ce8525026eb9 (patch) | |
| tree | 9a68d7e51e0bba7da1560df9733124b7c1e35e7c | |
| parent | e9346b539a3ba2e99baaa4d6daec704c95727f50 (diff) | |
| download | haskell-a3c6f5e4f16301cb4b9bb1629108ce8525026eb9.tar.gz | |
Revert "gitlab: Drop submodules hack"
It turns out that the submodules hack is useful to ensure that
CI works in forks.
This reverts commit 90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc.
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | .gitlab/fix-submodules.py | 8 |
2 files changed, 28 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fb8192e26..9c97baa5d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,11 @@ variables: GIT_SSL_NO_VERIFY: "1" - GIT_SUBMODULE_STRATEGY: "recursive" - LANG: "en_US.UTF-8" + +before_script: + - python3 .gitlab/fix-submodules.py + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules stages: - lint @@ -50,6 +54,10 @@ validate-x86_64-linux-deb8-hadrian: before_script: # workaround for docker permissions - sudo chown ghc:ghc -R . + - python3 .gitlab/fix-submodules.py + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules tags: - x86_64-linux @@ -94,6 +102,11 @@ validate-x86_64-darwin: ac_cv_func_clock_gettime: "no" LANG: "en_US.UTF-8" before_script: + - python .gitlab/fix-submodules.py + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules + - bash .gitlab/darwin-init.sh - PATH="`pwd`/toolchain/bin:$PATH" # Disable sphinx PDF output as MacTeX apparently doesn't provide xelatex @@ -115,6 +128,11 @@ validate-x86_64-darwin: tags: - x86_64-linux before_script: + - python3 .gitlab/fix-submodules.py + - git submodule sync --recursive + - git submodule update --init --recursive + - git checkout .gitmodules + - bash .circleci/prepare-system.sh # workaround for docker permissions - sudo chown ghc:ghc -R . diff --git a/.gitlab/fix-submodules.py b/.gitlab/fix-submodules.py new file mode 100644 index 0000000000..2ff8e41974 --- /dev/null +++ b/.gitlab/fix-submodules.py @@ -0,0 +1,8 @@ +#!/usr/bin/python + +import re + +x = open('.gitmodules').read() +x = re.sub(r"url *= *\.\.", "url = https://gitlab.haskell.org/ghc", x) +open('.gitmodules', 'w').write(x) + |