diff --git a/.travis.yml b/.travis.yml index be81f14..52d40e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,11 @@ before_install: - export DISPLAY=:99.0 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 -extension RANDR -- npm install -g npm +# On 0.10, we want to test with the default version of npm, otherwise +# upgrade to the latest. +- if [[ ${TRAVIS_NODE_VERSION:0:1} -gt "0" ]]; then + npm install -g npm; + fi install: - npm install script: diff --git a/README.md b/README.md index dede201..8f59a2b 100644 --- a/README.md +++ b/README.md @@ -12,21 +12,12 @@ Replacing the previous python tool for developing Firefox Add-ons, [cfx](https:/ ## Install -To install with npm, version 3.0.0 or higher is required. -Make sure you are up to date: - - npm install --global npm - -Here's how to -[complete the npm upgrade](https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows) -on Windows. - -Install the jpm module: +Install the latest stable version from NPM: npm install --global jpm - -Install from GitHub to get the latest features or to work on jpm itself. +Alternatively, you can install +from the GitHub source to get the latest features or to work on jpm itself. Use [npm link](https://www.npmjs.org/doc/cli/npm-link.html) to add the `jpm` global to your path: git clone https://github.com/mozilla-jetpack/jpm.git diff --git a/package.json b/package.json index f10e9ec..2bc45a0 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "read": "1.0.7", "request": "2.67.0", "semver": "5.1.0", - "sign-addon": "0.1.1", + "sign-addon": "0.1.2", "tmp": "0.0.28", "when": "3.7.2", "xml2js": "0.4.16",