[commit: ghc] master: gitlab-ci: Ensure that build environment is clean (290cb9b)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/290cb9bc527ee4fd33ffc1169eb6b521f6f94003/ghc

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

commit 290cb9bc527ee4fd33ffc1169eb6b521f6f94003
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 21 14:49:57 2018 -0500

    gitlab-ci: Ensure that build environment is clean


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

290cb9bc527ee4fd33ffc1169eb6b521f6f94003
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0d15f0..fbc8409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,7 @@ ghc-linters:
 .validate-hadrian:
   allow_failure: true
   script:
+    - git clean -xdf
     - bash .circleci/prepare-system.sh
     - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi
     - ./boot
@@ -83,7 +84,7 @@ validate-x86_64-linux-deb8-hadrian:
   variables:
     TEST_TYPE: test
   script:
-    - make clean || true
+    - git clean -xdf
     - ./boot
     - ./configure $CONFIGURE_ARGS
     - |
@@ -269,6 +270,7 @@ validate-x86_64-linux-deb9-unreg:
 
 .validate-windows:
   before_script:
+    - git clean -xdf
     - PATH=C:\msys64\usr\bin;%PATH%
     - python .gitlab/fix-submodules.py
     - git submodule sync --recursive