Skip to content

Commit 7f86709

Browse files
committed
Merge pull request #7 from joneshf/better-travis
Better travis
2 parents fe6ca56 + cb1c3ce commit 7f86709

4 files changed

Lines changed: 19 additions & 30 deletions

File tree

.travis.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- 0.10
44
env:
5-
- PATH=$HOME/bin:$PATH purescript_datadir=$HOME/.local/share/purescript
6-
before_install:
7-
- mkdir -p $HOME/bin
8-
- mkdir -p $HOME/.local/share/purescript/prelude
5+
- TAG=v0.6.1.1
96
install:
10-
- wget -O $HOME/bin/psc https://github.com/purescript/purescript/releases/download/0.5.6.2/psc
11-
- wget -O $HOME/bin/psci https://github.com/purescript/purescript/releases/download/0.5.6.2/psci
12-
- wget -O $HOME/bin/psc-make https://github.com/purescript/purescript/releases/download/0.5.6.2/psc-make
13-
- wget -O $HOME/bin/docgen https://github.com/purescript/purescript/releases/download/0.5.6.2/docgen
14-
- wget -O $HOME/bin/hierarchy https://github.com/purescript/purescript/releases/download/0.5.6.2/hierarchy
15-
- wget -O $purescript_datadir/prelude/prelude.purs https://github.com/purescript/purescript/releases/download/0.5.6.2/prelude.purs
16-
- chmod a+x $HOME/bin/psc
17-
- chmod a+x $HOME/bin/psci
18-
- chmod a+x $HOME/bin/psc-make
19-
- chmod a+x $HOME/bin/docgen
20-
- chmod a+x $HOME/bin/hierarchy
21-
- "npm install bower gulp -g"
22-
- "npm install && bower install"
7+
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
8+
- sudo tar zxvf $HOME/purescript.tar.gz -C /usr/local/bin purescript/psc{,i,-docs,-make} --strip-components=1
9+
- sudo chmod a+x /usr/local/bin/psc{,i,-docs,-make}
10+
- npm install bower gulp -g
11+
- npm install && bower install
2312
script:
24-
- "gulp"
13+
- gulp

gulpfile.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ function compile (compiler, src, opts) {
4646

4747
function docs (target) {
4848
return function() {
49-
var docgen = purescript.docgen();
50-
docgen.on('error', function(e) {
49+
var pscDocs = purescript.pscDocs();
50+
pscDocs.on('error', function(e) {
5151
console.error(e.message);
52-
docgen.end();
52+
pscDocs.end();
5353
});
5454
return gulp.src(paths.docs[target].src)
55-
.pipe(docgen)
55+
.pipe(pscDocs)
5656
.pipe(gulp.dest(paths.docs[target].dest));
5757
}
5858
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"devDependencies": {
77
"gulp": "^3.8.6",
8-
"gulp-purescript": "0.0.9",
8+
"gulp-purescript": "^0.1.2",
99
"gulp-run": "^1.6.4",
1010
"run-sequence": "^0.3.6"
1111
}

src/Data/Argonaut/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
### Types
1919

20-
type JArray = [Json]
20+
type JArray = [Json]
2121

22-
type JAssoc = Tuple String Json
22+
type JAssoc = Tuple String Json
2323

24-
type JBoolean = Boolean
24+
type JBoolean = Boolean
2525

2626
data JNull :: *
2727

28-
type JNumber = Number
28+
type JNumber = Number
2929

30-
type JObject = M.StrMap Json
30+
type JObject = M.StrMap Json
3131

32-
type JString = String
32+
type JString = String
3333

3434
data Json :: *
3535

0 commit comments

Comments
 (0)