[commit: ghc] wip/test-hadrian-caching: Always test with --shared (053af3c)

[git at git.haskell.org]

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

On branch  : wip/test-hadrian-caching
Link       : http://ghc.haskell.org/trac/ghc/changeset/053af3cafac4f5a9fd64e80eb0444cebf078cb15/ghc

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

commit 053af3cafac4f5a9fd64e80eb0444cebf078cb15
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Feb 20 19:16:25 2019 -0500

    Always test with --shared
    
    It doesn't seem worthwhile to add an entire CI job just to test caching.


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

053af3cafac4f5a9fd64e80eb0444cebf078cb15
 .gitlab-ci.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5156ad9..9a0d93f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,13 +60,13 @@ ghc-linters:
     - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi
     - ./boot
     - ./configure $CONFIGURE_ARGS
-    - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` $HADRIAN_OPTS
+    - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --shared=_cache
     - hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` docs-haddock
-      # Support for testing Hadrian caching
-    - if [[ -d ./_cache ]]; then
-        rm -R ./_build
-        hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` $HADRIAN_OPTS
-      fi
+      # Make sure that caching works properly: _build should be recreated from
+      # the _cache if deleted
+    - |
+      rm -R ./_build
+      hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --shared=_cache
   cache:
     key: hadrian
     paths:
@@ -88,11 +88,6 @@ validate-x86_64-linux-deb8-hadrian:
   tags:
     - x86_64-linux
 
-validate-x86_64-linux-deb8-hadrian-cached:
-  extends: validate-x86_64-linux-deb8-hadrian
-  variables:
-    HADRIAN_OPTS: --shared=_cache
-
 ############################################################
 # Validation via Pipelines (make)
 ############################################################