From 1472aab5d1deca181e4734b92688583c83a99da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?=
 <steffen.muething@iwr.uni-heidelberg.de>
Date: Tue, 3 Jul 2018 13:53:36 +0200
Subject: [PATCH] Removing workaround for git submodules

The upstream bug is fixed, the workaround is not necessary anymore.
---
 .gitlab-ci.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92398169..70f680e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,9 @@
 ---
 variables:
-# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148
-# value should be "recursive" without workaround
-  GIT_SUBMODULE_STRATEGY: none
+  GIT_SUBMODULE_STRATEGY: recursive
 
 before_script:
 - 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
-- git submodule sync --recursive
-- git submodule update --init --recursive
-# end workaround
 - patches/apply_patches.sh
 # detect number of processors, but make sure never to run with -j"", as the
 # build host would likely run out of memory
-- 
GitLab