Skip to content

Commit 61512fc

Browse files
committed
Simplify CI build scripts
1 parent 5e60ae3 commit 61512fc

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ env:
2525
before_install:
2626
- export DISPLAY=':99.0'
2727
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
28+
- test "$(uname)" = "Darwin" || export CXX=g++-4.9 CC=gcc-4.9
2829
- curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
2930
- source ~/.nvm/nvm.sh
3031
- nvm install $NODE_VERSION
3132
- nvm use $NODE_VERSION
32-
- test "$(uname)" = "Darwin" || export CXX=g++-4.9 CC=gcc-4.9
3333

3434
install:
3535
- npm install
3636
- '[ -z "$ELECTRON" ] || npm install electron-prebuilt@${ELECTRON}'
37-
- '[ -z "$REBUILD" ] || npm install -g node-gyp'
38-
- '[ -z "$REBUILD" ] || node-gyp rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
37+
- '[ -z "$REBUILD" ] || ./node_modules/node-gyp/bin/node-gyp.js rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
3938

4039
script: if [[ -z "$ELECTRON" ]]; then travis_retry npm run coverage; else travis_retry npm run test:electron; fi
4140

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ install:
1717
- ps: Install-Product node $env:nodejs_version $env:platform
1818
- npm install
1919
- IF DEFINED ELECTRON (npm install electron-prebuilt@%ELECTRON%)
20-
- IF DEFINED ELECTRON (npm install -g node-gyp)
2120
# We always need to rebuild for electron even for electron <= 1.1.3
22-
- IF DEFINED ELECTRON (node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
21+
- IF DEFINED ELECTRON (node_modules\.bin\node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
2322

2423

2524
test_script:
2625
- IF DEFINED ELECTRON (appveyor-retry call npm run test:electron) ELSE (appveyor-retry call npm test)
2726

2827
deploy_script:
29-
- IF "%deploy%;%appveyor_repo_tag%"=="true;true" (npm install prebuild -g & prebuild --all -u %GITHUB_TOKEN%)
28+
- IF "%deploy%;%appveyor_repo_tag%"=="true;true" (node_modules\.bin\prebuild --all -u %GITHUB_TOKEN%)
3029

3130
notifications:
3231
- provider: Slack

scripts/publish_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $DEPLOY == "true" && $TRAVIS_OS_NAME == "linux" ]]
2+
if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'zeromq/zeromq.js' && $TRAVIS_BRANCH == "master" && $DEPLOY == "true" && $TRAVIS_OS_NAME == "linux" ]]
33
then
44
npm run build:docs
55

0 commit comments

Comments
 (0)