Skip to content
This repository has been archived by the owner on Mar 4, 2022. It is now read-only.

Commit

Permalink
Merge 093c0e4 into c82da9d
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-roemer committed Oct 6, 2017
2 parents c82da9d + 093c0e4 commit d5d7eaf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 45 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
\.git
\.hg
.git

\.DS_Store
\.project
.DS_Store
.project
bower_components
node_modules
npm-debug\.log*
npm-debug.log*
yarn-error.log*
phantomjsdriver\.log

# Build
Expand Down
23 changes: 2 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ node_js:
- "0.10"
- "0.12"
- "4"
- "5"
# By `v6.10.2` we hit this error:
# - https://github.com/FormidableLabs/builder/issues/141
# - https://github.com/substack/node-mkdirp/pull/110
# so pin for now.
- "6.9.5"
- "6"
- "8"

# Use container-based Travis infrastructure.
sudo: false
Expand All @@ -18,26 +14,11 @@ branches:
only:
- master

env:
- TEST_NPM_VERSION=2
- TEST_NPM_VERSION=3
- TEST_NPM_VERSION=4

matrix:
exclude:
- node_js: "5"
env: TEST_NPM_VERSION=2
- node_js: "6.9.5"
env: TEST_NPM_VERSION=2

before_install:
# GUI for real browsers.
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

# Use the requested version of npm
- npm install -g "npm@$TEST_NPM_VERSION"

script:
- npm --version
- npm run builder:check-ci
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,20 @@ $ builder envs <task> --envs-path=<path-to-json-file>

Examples:

**Mac / Linux**

```sh
$ builder envs <task> '[{ "FOO": "VAL1" }, { "FOO": "VAL2" }, { "FOO": "VAL3" }]'
$ builder envs <task> '[{ "FOO": "VAL1", "BAR": "VAL2" }, { "FOO": "VAL3" }]'
```

**Mac / Linux / Windows**

```sh
$ builder envs <task> "[{ \"FOO\": \"VAL1\" }, { \"FOO\": \"VAL2\" }, { \"FOO\": \"VAL3\" }]"
$ builder envs <task> "[{ \"FOO\": \"VAL1\", \"BAR\": \"VAL2\" }, { \"FOO\": \"VAL3\" }]"
```

Flags:

* `--tries`: Number of times to attempt a task (default: `1`)
Expand Down
23 changes: 4 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,13 @@ environment:
TEST_NPM_VERSION: 3

- nodejs_version: 4
TEST_NPM_VERSION: 3

- nodejs_version: 5
TEST_NPM_VERSION: 3
TEST_NPM_VERSION: latest

- nodejs_version: 6
TEST_NPM_VERSION: 3

- nodejs_version: 0.10
TEST_NPM_VERSION: 4
TEST_NPM_VERSION: latest

- nodejs_version: 0.12
TEST_NPM_VERSION: 4

- nodejs_version: 4
TEST_NPM_VERSION: 4

- nodejs_version: 5
TEST_NPM_VERSION: 4

- nodejs_version: 6
TEST_NPM_VERSION: 4
- nodejs_version: 8
TEST_NPM_VERSION: latest


# Install scripts. (runs after repo cloning)
Expand Down

0 comments on commit d5d7eaf

Please sign in to comment.