Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: add OS X to travis #1553

Merged
merged 3 commits into from
Sep 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
language: node_js
node_js:
- 6
- 4
- 0.12

# To test Node v4, Travis needs to use a newer C++ compiler.
# Source: https://github.com/nodejs/nan/issues/435#issuecomment-136063745
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- 6
- 4
- 0.12
os:
- linux
- osx
before_install:
- export CXX=g++-4.8
- "$CXX --version"
- npm install -g npm # Force using the latest npm to get dedupe during install
script: "./scripts/build.sh"
before_deploy: "./scripts/release.sh"
deploy:
provider: npm
email: sawchuk@gmail.com
api_key:
secure: H8H4ATiE64gTgiectfIYatsSnm7uDQrgQPvnLp7Ra1piElS+f1lLzdiN8+pDGP3h+OHU/PE8KsXhtVLfYTX5zroo3Y70n5TE4uTO62PL6WZl5R1+L5bUKcrffcHMsjH0mmiK5d0TW032tMcybAHsPcj9wiOZpf6aBIEEFY/1V5o=
on:
tags: true
repo: GoogleCloudPlatform/google-cloud-node
all_branches: true
sudo: false
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"docs": "node ./scripts/docs/packages.js",
"bundle": "node ./scripts/docs/bundle.js",
"lint": "jshint scripts/ packages/ system-test/ test/ && jscs packages/ system-test/ test/",
"test": "npm run docs && npm run bundle && mocha --timeout 5000 test/docs.js packages/*/test/*.js",
"test": "npm run docs && npm run bundle && mocha --timeout 5000 --bail test/docs.js packages/*/test/*.js",
"system-test": "mocha packages/*/system-test/*.js --no-timeouts --bail",
"cover": "istanbul cover _mocha --report lcovonly -x 'packages/*/src/v*/*.js' -- --no-timeouts --bail packages/*/test/*.js -R spec",
"coveralls": "npm run cover && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
Expand Down
3 changes: 3 additions & 0 deletions packages/bigquery/src/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,9 @@ Table.prototype.getRows = function(options, callback) {
* //-
* // Load data from a file in your Cloud Storage bucket.
* //-
* var gcs = require('@google-cloud/storage')({
* projectId: 'grape-spaceship-123'
* });
* var data = gcs.bucket('institutions').file('data.csv');
* table.import(data, function(err, job, apiResponse) {});
*
Expand Down