diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-17 19:41:22 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-17 22:15:22 -0500 |
| commit | 90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc (patch) | |
| tree | 1f30235131318c1a9a046767239ac8cd6da3a0ab | |
| parent | f109865fba14112d7cb3840111bdfd985d81c0c3 (diff) | |
| download | haskell-90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc.tar.gz | |
gitlab: Drop submodules hack
| -rw-r--r-- | .gitlab-ci.yml | 21 | ||||
| -rw-r--r-- | .gitlab/fix-submodules.py | 8 |
2 files changed, 1 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9c51a2003..d41f05bc8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,6 @@ variables: GIT_SSL_NO_VERIFY: "1" - -before_script: - - python3 .gitlab/fix-submodules.py - - git submodule sync --recursive - - git submodule update --init --recursive - - git checkout .gitmodules + GIT_SUBMODULES_STRATEGY: "recursive" stages: - lint @@ -53,10 +48,6 @@ 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 @@ -100,11 +91,6 @@ validate-x86_64-darwin: # Only Sierra and onwards supports clock_gettime. See #12858 ac_cv_func_clock_gettime: "no" 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 @@ -125,11 +111,6 @@ 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 deleted file mode 100644 index 51c9b06183..0000000000 --- a/.gitlab/fix-submodules.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/python - -import re - -x = open('.gitmodules').read() -x = re.sub(r"url *= *\.\.", "url = https://git.haskell.org", x) -open('.gitmodules', 'w').write(x) - |