Fix tests on travis

[opengl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index ab2505ad990c8f144c43e89165e24398ffc0bf54..faae98652da6078d133cecc3bf13a6f1990c4b4a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,13 @@
-language: haskell
-ghc:
-  - "8.2.2"
-  - "8.4.3"
+language: c
 
 sudo: false
 
-# Caching so the next build will be fast too.
 cache:
   directories:
-  - dist
-  - dist-newstyle
+    - .stack-work
     - $HOME/.stack
     - $HOME/haskell-ide-engine/.stack-work
+  timeout: 1000
 
 addons:
   apt:
@@ -19,37 +15,23 @@ addons:
       - npm
 
 before_install:
-  - printenv
   - mkdir -p ~/.local/bin
   - export PATH=$HOME/.local/bin:$PATH
   - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
-  - stack config set system-ghc --global true
-  # - export PATH=/opt/ghc/8.4.3/bin:$PATH
-  # - sh .download-hie.sh
-  # - export PATH=$TRAVIS_BUILD_DIR:$PATH
-  # - hie version
   - mkdir -p haskell-ide-engine
   - cd $HOME/haskell-ide-engine
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
   - git pull origin master
+  - git checkout f5c903f31ef5a7ee75984faf2e6ccc0a06ab23eb
   - git submodule init
   - git submodule sync
   - git submodule update --init
-  - stack --no-terminal --skip-ghc-check -j2 install --stack-yaml=stack-$TRAVIS_HASKELL_VERSION.yaml
-  - stack exec hoogle generate --stack-yaml=stack-$TRAVIS_HASKELL_VERSION.yaml
+  - stack --no-terminal --skip-ghc-check -j2 install
+  - stack exec hoogle generate
   - cd $TRAVIS_BUILD_DIR
-  - hie --version
-  # - git submodule init
-  # - git submodule sync
-  # - git submodule update
-  # - cabal new-configure
-  # - cabal new-build -j2
-  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/c/hie/build/hie/hie:$PATH
   - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
-  - stack test --no-terminal --skip-ghc-check -j2  --stack-yaml=stack-$TRAVIS_HASKELL_VERSION.yaml
-  # - cabal configure --enable-tests
-  # - cabal test --show-details=streaming
+  - stack test