diff options
author | Csaba Hruska <csaba.hruska@gmail.com> | 2018-02-02 23:14:42 +0100 |
---|---|---|
committer | Csaba Hruska <csaba.hruska@gmail.com> | 2018-02-02 23:14:42 +0100 |
commit | 7a2ca6416b3cc4b3e918e0e4bd75319ac926070a (patch) | |
tree | 5697a243488a3c28656f3f8a327e146b258c4e78 | |
parent | 4841bbb17e707859133fee330065c4e8068506c9 (diff) |
simplify stack and travis ci env
-rw-r--r-- | .travis.yml | 13 | ||||
-rw-r--r-- | stack.yaml | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index bc9fe8e5..f7370734 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -2,11 +2,6 @@ sudo: false | |||
2 | dist: trusty | 2 | dist: trusty |
3 | language: generic | 3 | language: generic |
4 | 4 | ||
5 | env: | ||
6 | global: | ||
7 | - GCC=gcc-5 | ||
8 | - GXX=g++-5 | ||
9 | |||
10 | cache: | 5 | cache: |
11 | directories: | 6 | directories: |
12 | - $HOME/.stack/ | 7 | - $HOME/.stack/ |
@@ -14,20 +9,12 @@ cache: | |||
14 | addons: | 9 | addons: |
15 | apt: | 10 | apt: |
16 | packages: | 11 | packages: |
17 | - gcc-5 | ||
18 | - g++-5 | ||
19 | - libgmp-dev | 12 | - libgmp-dev |
20 | - llvm-5.0-dev | ||
21 | sources: | ||
22 | - llvm-toolchain-trusty-5.0 | ||
23 | - ubuntu-toolchain-r-test | ||
24 | 13 | ||
25 | before_install: | 14 | before_install: |
26 | - mkdir -p ~/.local/bin | 15 | - mkdir -p ~/.local/bin |
27 | - export PATH=~/.local/bin:$PATH | 16 | - export PATH=~/.local/bin:$PATH |
28 | - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' | 17 | - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' |
29 | - export CC=/usr/bin/$GCC | ||
30 | - export CXX=/usr/bin/$GXX | ||
31 | 18 | ||
32 | install: | 19 | install: |
33 | - stack update | 20 | - stack update |
@@ -9,8 +9,6 @@ packages: | |||
9 | extra-dep: true | 9 | extra-dep: true |
10 | extra-deps: | 10 | extra-deps: |
11 | - vect-0.4.7 | 11 | - vect-0.4.7 |
12 | - megaparsec-6.4.0 | ||
13 | - parser-combinators-0.4.0 | ||
14 | flags: | 12 | flags: |
15 | lambdacube-compiler: | 13 | lambdacube-compiler: |
16 | alltest: true | 14 | alltest: true |