Re-export Expression from Predicates
[hadrian.git] / .travis.yml
index cf2f1cb..7d5b699 100644 (file)
@@ -1,15 +1,13 @@
-sudo: false
+sudo: true
 
 matrix:
     include:
         - os: linux
-          env: CABALVER=1.22 GHCVER=7.10.3
+          env: CABALVER=1.22 GHCVER=7.10.3 TARGET=
           addons:
               apt:
                   packages:
                       - ghc-7.10.3
-                      - alex-3.1.4
-                      - happy-1.19.5
                       - cabal-install-1.22
                       - zlib1g-dev
                   sources: hvr-ghc
@@ -19,8 +17,10 @@ matrix:
               - PATH="$HOME/.cabal/bin:$PATH"
               - export PATH
               - cabal update
+              - cabal install alex happy
 
         - os: osx
+          env: TARGET=
           before_install:
               - brew update
               - brew install ghc cabal-install
@@ -47,21 +47,19 @@ install:
     # of "ghc/". For this reason, we - rather hackily - move the GHC-Shake
     # ".git"  directory into the appropriate location, and perform a hard reset
     # in order to regenerate the GHC-Shake files.
-    - mkdir ghc/shake-build
-    - mv .git ghc/shake-build
-    - ( cd ghc/shake-build && git reset --hard HEAD )
+    - mkdir ghc/hadrian
+    - mv .git ghc/hadrian
+    - ( cd ghc/hadrian && git reset --hard HEAD )
 
-    - ( cd ghc/shake-build && cabal install --only-dependencies )
-    - ( cd ghc/shake-build && cabal configure )
+    - ( cd ghc/hadrian && cabal install --only-dependencies )
+    - ( cd ghc/hadrian && cabal configure )
 
-    - ( cd ghc && ./boot )
-    - ( cd ghc && ./configure )
-    - cat ghc/shake-build/cfg/system.config
+    - ghc-pkg list
 
 script:
-    - ( cd ghc/shake-build && cabal haddock --internal )
-    - ./ghc/shake-build/build.sh selftest
-    - ./ghc/shake-build/build.sh -j --no-progress --flavour=quick
+    - ( cd ghc/hadrian && cabal haddock --internal )
+    - ./ghc/hadrian/build.sh selftest
+    - ./ghc/hadrian/build.sh -j --no-progress --profile=- --flavour=quick $TARGET
 
 cache:
     directories: