From 2fbd8ef2dea50d228466f74e1806f20fcf3e7f50 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Fri, 11 May 2018 23:40:50 -0400 Subject: [PATCH 1/4] Add grunt-cli to devDependencies This makes it possible to build mp4box without installing global dependencies: npm install ./node_modules/.bin/grunt --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 40930ab9..3bfca876 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "blanket": "^1.2.3", "grunt": "^0.4.5", "grunt-bump": "^0.3.1", + "grunt-cli": "^1.2.0", "grunt-contrib-concat": "^0.5.0", "grunt-contrib-jshint": "^0.10.0", "grunt-contrib-qunit": "^0.5.2", From b1e61291dc212e26e6b50fd987f0294f594c55e7 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 12 May 2018 12:13:20 -0400 Subject: [PATCH 2/4] Don't require $NPM_TOKEN for Travis tests, only deployment I'm hoping this will make Travis more useful for pull requests. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d658429..c94a4c47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ sudo: false node_js: - '6.0.0' before_install: -- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc - "export CHROME_BIN=chromium-browser" - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" @@ -14,6 +13,8 @@ before_script: - 'npm install karma' - 'npm install grunt-karma' - 'npm install karma-phantomjs-launcher' +before_deploy: +- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc deploy: - provider: releases api_key: From 573f8e924cc37b2ec2785fcfb7b9d04ce7630a8c Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 12 May 2018 12:50:24 -0400 Subject: [PATCH 3/4] Increase test timeout to 5 seconds This should make the tests less flaky, reducing failures like the following on master: https://travis-ci.org/gpac/mp4box.js/builds/364225384#L1604-L1608 --- karma.conf.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/karma.conf.js b/karma.conf.js index f3b98656..1973d1d3 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -12,6 +12,14 @@ module.exports = function(config) { frameworks: ['qunit'], + // client configuration + client: { + qunit: { + testTimeout: 5000 + } + }, + + // list of files / patterns to load in the browser files: [ '../src/log.js', // logging system From 03f5fd992924ab262d8a0271bb12b58ce14347d5 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 12 May 2018 13:07:35 -0400 Subject: [PATCH 4/4] Move remaining Travis `before_install` packages to devDependencies --- .travis.yml | 6 ------ package.json | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d658429..0f4fdc6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,6 @@ before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start -before_script: - - 'npm install -g grunt-cli' - - 'npm install grunt' - - 'npm install karma' - - 'npm install grunt-karma' - - 'npm install karma-phantomjs-launcher' deploy: - provider: releases api_key: diff --git a/package.json b/package.json index 3bfca876..0ed54732 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "karma-chrome-launcher": "^0.1.12", "karma-coverage": "^0.5.5", "karma-firefox-launcher": "^0.1.6", + "karma-phantomjs-launcher": "^1.0.4", "karma-qunit": "^0.1.4", "qunitjs": "^1.23.0" },