From 6414bf876e266ac4c5dd749cf65dab3e1827b23f Mon Sep 17 00:00:00 2001
From: Christiaan Baaij <christiaan.baaij@gmail.com>
Date: Sat, 17 Mar 2018 19:09:57 +0000
Subject: [PATCH] Test on ghc-head

---
 .travis.yml         | 9 ++++++---
 clash-prelude.cabal | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1ff83c..612c745 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,11 +40,14 @@ matrix:
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.1"
-      env: GHCHEAD=true
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
+    - compiler: "ghc-head"
+      env: GHCHEAD=true
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
 
   allow_failures:
-    - compiler: "ghc-8.4.1"
+    - compiler: "ghc-head"
 
 before_install:
   - HC=${CC}
@@ -91,7 +94,7 @@ install:
   - rm -f cabal.project.freeze
   - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
   - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
-  - rm -rf "."/.ghc.environment.* "."/dist
+  - rm -rf .ghc.environment.* "."/dist
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
 
 # Here starts the actual work to be performed for the package under test;
diff --git a/clash-prelude.cabal b/clash-prelude.cabal
index 8f2b927..4ce3f7b 100644
--- a/clash-prelude.cabal
+++ b/clash-prelude.cabal
@@ -60,7 +60,7 @@ Extra-source-files:   README.md
 extra-doc-files:      doc/*.svg
 
 Cabal-version:        >=1.18
-Tested-with:          GHC == 8.2.2, GHC == 8.4.1
+Tested-with:          GHC == 8.2.2, GHC == 8.4.1, GHC == 8.5
 
 source-repository head
   type: git