Skip to content

Commit

Permalink
fix(lwip): Update lwip to fix 'node-gyp rebuild' failure
Browse files Browse the repository at this point in the history
  • Loading branch information
jimwhitelaw committed Dec 2, 2016
1 parent 4aa87e6 commit 663c4f5
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 44 deletions.
51 changes: 15 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,23 @@
language: node_js
node_js:
- iojs-v1
- '0.12'
- '0.10'
sudo: false
cache:
directories:
- node_modules
- node_modules
notifications:
email: false
slack:
secure: Y76p61gumCAEgRG73AVSa/fK5dg0OAUuGbYWH8JuCtLnTdSmiptaY6Z4DZr8ov6SJCqwLMsjJzJ+lbtul5XLfUmx1RrLvz41uUuaQS3RPSq+3YGShYg/Q7+5GT1Xr/TAX3YmmOEQ11M7OeyQPEt75Im8p/iacbpRS1hvR6iwaCY=
node_js:
- 'node'
- '6'
- '4'
before_install:
- npm i -g npm@^2.0.0
- npm i -g pangyp
- npm prune
install:
- npm install --node-gyp=$(which pangyp)
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get -qq update
- sudo apt-get -qq install g++-4.8
env:
- CXX=g++-4.8
before_script:
- curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py
- npm prune
after_success:
- python travis_after_all.py
- export $(cat .to_export_back)
after_failure:
- python travis_after_all.py
- export $(cat .to_export_back)
before_deploy:
- rm -f travis_after_all.py .to_export_back
after_script:
- echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
deploy:
provider: npm
email: david@excellenteasy.com
skip_cleanup: true
on:
branch: master
repo: excellenteasy/ios-splash-generate
condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded"
api_key:
secure: IUwmlpvZiyxUFYK3M8qPZzPAgSY8FZSLCaPQpb3QzOUgHPDkb4cwYFxI0JuRjr3k3Z3k74nvVprsOjYrI7aCczxReSKg0JYmEEYU2Rszb1LmYd+xBGgCGW91KXPAKkjYo26eD4czi6b4VCfoMZ+D9DShrBNcHVhkMhUih2CMrxk=
env:
global:
secure: BunP5NonyOo9FYXJy+dTsPQjMqrDI9pVl102Nzb19763zsdXfJuVKSydai7MTLrCamlZz5LicyobE/bOzrmlAYgEmMHcuT6dktWdylNqdtuhUcK1knlpo5Pfw9zM3lmFjlEDJ6HltmxIE7ET2hEel3i77x3mgKfIMs49HD6/Vlg=
- npm run semantic-release
branches:
except:
- /^v\d+\.\d+\.\d+$/
24 changes: 19 additions & 5 deletions bin/ios-splash-generate.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#!/usr/bin/env node
'use strict'
var argv = require('minimist')(process.argv.slice(2))
var abbrev = require('abbrev')
var minimist = require('minimist')
var pkg = require('../package.json')
var generate = require('../')
var input = argv.input || argv.i
var output = argv.output || argv.o

var opts = {
alias: abbrev('help', 'input', 'output', 'version')
}

var argv = minimist(process.argv.slice(2), opts)

function help () {
console.log([
Expand All @@ -26,8 +31,17 @@ function cli () {
return
}

if (input) {
generate(argv.input || argv.i, output)
if (argv.input) {
// minimist will produce an array of values for args with full --options
// smush it down to a single string that resize() can use
if (argv.input.constructor === Array) {
argv.input = argv.input[0]
}
if (argv.output.constructor === Array) {
argv.output = argv.output[0]
}

generate(argv.input, argv.output)
return
} else {
console.error('Please specify an input icon file witht the `-i` option.')
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"colors": "^1.0.3",
"ios-splash": "^2.0.0",
"lwip": "0.0.6",
"lwip": "0.0.9",
"minimist": "^1.1.0",
"q": "^1.1.2"
},
Expand All @@ -28,8 +28,7 @@
},
"scripts": {
"test": "standard && node test.js",
"prepublish": "semantic-release pre",
"postpublish": "semantic-release post"
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
},
"files": [
"index.js",
Expand Down

0 comments on commit 663c4f5

Please sign in to comment.