X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=.travis.yml;h=d665c855de596e51597ed141d9132dbe04504bf6;hp=2883617bd3186b42375d6f945a0ee2c0a37b400d;hb=a576ee3be40fcc0658ec0b7779aabadcfea6ba0c;hpb=4dce1170b5433bbad129b19b225c9fa533fc0e7e

diff --git a/.travis.yml b/.travis.yml
index 2883617..d665c85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,17 @@
 language: haskell
-
 ghc:
   - "8.2.2"
-  - "8.4.2"
+  - "8.4.3"
 
 sudo: false
 
 # Caching so the next build will be fast too.
 cache:
   directories:
+  - dist
+  - dist-newstyle
   - $HOME/.stack
-  - $HOME/haskell-ide-engine
+  - $HOME/haskell-ide-engine/.stack-work
 
 addons:
   apt:
@@ -18,30 +19,37 @@ addons:
     - npm
 
 before_install:
-  # Download and unpack the stack executable
+  - 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'
-    
-  - cd $HOME
-  # It's ok to fail
-  - git clone https://github.com/haskell/haskell-ide-engine.git --recursive || true
-  - cd haskell-ide-engine
-  - git pull
+  - 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 submodule init
   - git submodule sync
-  - git submodule update
-  # - cabal new-update
-  # - cabal new-configure
-  # - cabal new-build
-  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
-  - stack --no-terminal --skip-ghc-check install -j2
-  - stack exec hoogle generate
+  - 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
   - 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:
-  - pwd
-  - ls -a
+  # - stack test --compiler ghc-$TRAVIS_HASKELL_VERSION
   - cabal configure --enable-tests
-  - cabal test -j2 --show-details=streaming
+  - cabal test --show-details=streaming