[commit: ghc] master: gitlab: Drop submodules hack (90ceafa)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc/ghc

>---------------------------------------------------------------

commit 90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 17 19:41:22 2018 -0500

    gitlab: Drop submodules hack


>---------------------------------------------------------------

90ceafa8b9ad60e3c7b72cdd2dacdbeb96bdcddc
 .gitlab-ci.yml            | 21 +--------------------
 .gitlab/fix-submodules.py |  8 --------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9c51a2..d41f05b 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 51c9b06..0000000
--- 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)
-