git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge branch 'master' into 1246
commitf144aabd98db42b185ac7356cdc87fb6480edae6 authorPhil Freeman <paf31@cantab.net> dateTue 11 Aug 2015, 19:21 (11 years ago) parent3ff09c1e698b60
3 files changed+8−7
compare with golang
unifiedsplit
.travis.yml+5−4 README.md+1−2 travis/test-install.sh+2−1
.travis.yml+5−4
@@ -6,7 +6,7 @@ env:
66 - GHCVER=7.10.1
77 - GHCVER=7.8.4 STACKAGE=lts-2.22
88 # 7.10.2 Pending https://github.com/travis-ci/apt-package-whitelist/pull/686
9− - GHCVER=7.10.1 STACKAGE-nightly-2015-08-09
9+ - GHCVER=7.10.1 STACKAGE=nightly-2015-08-09
1010before_install:
1111 - export PATH="/opt/ghc/$GHCVER/bin:$PATH"
1212 - export PATH="/opt/cabal/1.22/bin:$PATH"
@@ -17,7 +17,8 @@ install:
1717 - cabal --version
1818 - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
1919 - travis_retry cabal update
20− - cabal sandbox init
20+ - mkdir -p sandboxes/$GHCVER/${STACKAGE:-none}
21+ - cabal sandbox init --sandbox sandboxes/$GHCVER/${STACKAGE:-none}
2122 # Download stackage cabal.config
2223 # Not sure whether filtering out purescript is necessary
2324 - if [ -n "$STACKAGE" ]; then curl http://www.stackage.org/$STACKAGE/cabal.config | grep -v purescript > cabal.config; fi
@@ -64,5 +65,5 @@ addons:
6465 - alex-3.1.4
6566cache:
6667 directories:
67− - .cabal-sandbox
68− - ../install-test/.cabal-sandbox
68+ - sandboxes/
69+ - ../install-test/sandboxes/
README.md+1−2
@@ -15,8 +15,7 @@ A small strongly typed programming language with expressive types that compiles
1515- [PureScript book](https://leanpub.com/purescript/read)
1616- [Wiki](http://wiki.purescript.org)
1717- [Try PureScript](http://try.purescript.org)
18−- [Pursuit package search engine](http://pursuit.purescript.org/)
19−- [Core library documentation index](http://functorial.com/psc-pages/docs)
18+- [Pursuit Package Index](http://pursuit.purescript.org/)
2019
2120## Help!
2221
travis/test-install.sh+2−1
@@ -7,6 +7,7 @@ if SRC_TGZ="$PWD/dist/$(cabal info . | awk '{print $2;exit}').tar.gz"
77then
88 mkdir -p ../install-test
99 cd ../install-test
10− cabal sandbox init
10+ mkdir -p sandboxes/$GHCVER/${STACKAGE:-none}
11+ cabal sandbox init --sandbox sandboxes/$GHCVER/${STACKAGE:-none}
1112 cabal install -j2 --ghc-options='+RTS -A32m -RTS' "$SRC_TGZ"
1213fi