gitlab-ci: Ensure that build environment is clean
authorBen Gamari <ben@smart-cactus.org>
Fri, 21 Dec 2018 19:49:57 +0000 (14:49 -0500)
committerBen Gamari <ben@smart-cactus.org>
Fri, 21 Dec 2018 21:54:40 +0000 (16:54 -0500)
.gitlab-ci.yml

index f0d15f0..fbc8409 100644 (file)
@@ -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