summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCsaba Hruska <csaba.hruska@gmail.com>2018-02-02 23:14:42 +0100
committerCsaba Hruska <csaba.hruska@gmail.com>2018-02-02 23:14:42 +0100
commit7a2ca6416b3cc4b3e918e0e4bd75319ac926070a (patch)
tree5697a243488a3c28656f3f8a327e146b258c4e78
parent4841bbb17e707859133fee330065c4e8068506c9 (diff)
simplify stack and travis ci env
-rw-r--r--.travis.yml13
-rw-r--r--stack.yaml2
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
2dist: trusty 2dist: trusty
3language: generic 3language: generic
4 4
5env:
6 global:
7 - GCC=gcc-5
8 - GXX=g++-5
9
10cache: 5cache:
11 directories: 6 directories:
12 - $HOME/.stack/ 7 - $HOME/.stack/
@@ -14,20 +9,12 @@ cache:
14addons: 9addons:
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
25before_install: 14before_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
32install: 19install:
33 - stack update 20 - stack update
diff --git a/stack.yaml b/stack.yaml
index 5ef04434..56b0eaaf 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,8 +9,6 @@ packages:
9 extra-dep: true 9 extra-dep: true
10extra-deps: 10extra-deps:
11- vect-0.4.7 11- vect-0.4.7
12- megaparsec-6.4.0
13- parser-combinators-0.4.0
14flags: 12flags:
15 lambdacube-compiler: 13 lambdacube-compiler:
16 alltest: true 14 alltest: true