Skip to content

Commit

Permalink
Merge pull request jxson#42 from jxson/add-saucelabs
Browse files Browse the repository at this point in the history
Add saucelabs
  • Loading branch information
jxson committed Apr 6, 2016
2 parents 5bf3520 + 748b19b commit 69eb785
Show file tree
Hide file tree
Showing 7 changed files with 197 additions and 121 deletions.
23 changes: 19 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,31 @@ sudo: false
language: node_js
node_js:
- stable
- 5
- 4
- iojs
- 0.12
- 0.11
- 0.10
- 0.1
before_install:
- npm install -g npm
env:
global:
# travis encrypt COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN
secure: he3kGOmSy6s97OdYRUq+k13w2WfIxzKfuDVysMfjOEV1U7YCq6tVeA6rm37yuyyaN3776he/fvPcK1Jd+FNfm8hzJMEu6QHqSd+Ri+q/32P+aXcEq2MEPMdsDAUpFqjT2p7BDPqH4a8DcJ0p48iXP+H2K3+HBaXNrneNLnU+6I8=
- secure: he3kGOmSy6s97OdYRUq+k13w2WfIxzKfuDVysMfjOEV1U7YCq6tVeA6rm37yuyyaN3776he/fvPcK1Jd+FNfm8hzJMEu6QHqSd+Ri+q/32P+aXcEq2MEPMdsDAUpFqjT2p7BDPqH4a8DcJ0p48iXP+H2K3+HBaXNrneNLnU+6I8=
- secure: HHxNmsHXJ3p9MBDXHmlSUYWaNX4KEq+VVpK4tlK1g67mGwPdlG9eFB4QFPTitYhqSTexCWSc9QwvPWVTWXzWemvwu6wBATxvKED8CKjTIlO2mOpwigV5KT7op7LU3f8WXvU+n5wV0ftHKU1nuDUu0ZgZEU4V9cAy9hMxNRmwpk8=
- secure: jvL8J6LnjpPwrrGqHu3bUAxdZByq9pMITkhRrxCbYMFcQQRFynqEdbY/c1dldei03HKx4sA76UtlbGPe78wWepSE2zBPuq8XpyRR2oCgmJsYfdNuv6op6Pmx20TJwBCXp1nlAOS+Fm3JLv72N3LZS63YhB1aRi+XEmhm7SbQ3gk=
matrix:
- TEST=node
- TEST=browser
script: make travis
matrix:
exclude:
- node_js: 4
env: TEST=browser
- node_js: iojs
env: TEST=browser
- node_js: 0.12
env: TEST=browser
- node_js: 0.11
env: TEST=browser
- node_js: 0.1
env: TEST=browser
18 changes: 18 additions & 0 deletions .zuul.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ui: tape
browserify:
- transform: brfs
browsers:
- name: chrome
version: latest
- name: firefox
version: latest
- name: ie
version: 9..latest
- name: iphone
version: latest
- name: safari
version: latest
- name: android
version: latest
- name: microsoftedge
version: latest
21 changes: 19 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ SHELL := /bin/bash
.DELETE_ON_ERROR:
.SUFFIXES:

TEST ?= node
version ?= patch

node_modules: package.json
Expand All @@ -29,9 +30,24 @@ lint: node_modules
@standard

.PHONY: test
test: lint node_modules
test: lint
@if [ "$(TEST)" = "browser" ]; \
then make test-browser; \
else make test-node; \
fi

.PHONY: test-node
test-node: node_modules
tape test/index.js

.PHONY: test-browser
test-browser: node_modules
zuul -- test/index.js

.PHONY: zuul
zuul: node_modules
zuul --local 8080 --ui tape -- test/index.js

.PHONY: release
release:
npm version $(version)
Expand All @@ -45,7 +61,8 @@ coverage: node_modules index.js test/index.js node_modules

.PHONY: coveralls
coveralls: node_modules coverage
@istanbul report lcov && (cat coverage/lcov.info | coveralls)
@istanbul report lcov
(cat coverage/lcov.info | coveralls) || exit 0

.PHONY: travis
travis: test coveralls
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
[![npm][npm-img]][npm-url]
[![github][github-img]][github-url]

[![Sauce Test Status](https://saucelabs.com/browser-matrix/front-matter.svg)](https://saucelabs.com/u/front-matter)

> Extract meta data (front-matter) from documents.
This modules does not do any IO (file loading or reading), only extracting and
Expand Down Expand Up @@ -106,6 +108,7 @@ This module is awesome because of all the folks who submitted pull requests:
- [Kenneth Lim](https://github.com/kenlimmj) - https://kenlimmj.com
- [Cameron Moy](https://github.com/camoy)
- [Fernando Montoya](https://github.com/montogeek) - https://montogeek.com
- [Martin Heidegger](https://github.com/martinheidegger)

# LICENSE (MIT)

Expand Down
1 change: 0 additions & 1 deletion examples/complex-yaml.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ pets:
- dog
- bat
match: !!js/regexp /pattern/gim
run: !!js/function function() { }



Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@
"js-yaml": "^3.4.6"
},
"devDependencies": {
"brfs": "^1.4.3",
"coveralls": "^2.11.6",
"istanbul": "^0.3.6",
"standard": "^6.0.4",
"standard-format": "^2.1.0",
"tape": "^4.4.0"
"tape": "^4.4.0",
"zuul": "^3.10.1"
},
"contributors": [
"Jason Campbell <[email protected]> (http://twitter.com/jxson)",
Expand Down
Loading

0 comments on commit 69eb785

Please sign in to comment.