From bed35178c96f8a68fee445d0fae91ecb278dc99b Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 20:03:55 -0400 Subject: [PATCH 1/6] ci(travis): update travis configuration --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51762742b..f405930d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,10 @@ language: node_js node_js: - - '4.0' + - '6' before_install: - - npm install -g bower - - npm install -g grunt-cli - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start install: - - bower install - - npm install + - npm run apply:bitpay after_success: - npm run exec:coveralls From 7bf04585a0a58607deee802337e65d318b956aa9 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 20:16:42 -0400 Subject: [PATCH 2/6] build(package): warn if using an unsupported version of node or npm --- app-template/package-template.json | 4 ++++ package.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app-template/package-template.json b/app-template/package-template.json index 5ff4ab91e..2ef5e1979 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -45,6 +45,10 @@ "bugs": { "url": "*GITHUBREPOBUGS*" }, + "engines": { + "node": "6", + "npm": "3" + }, "dependencies": { "adm-zip": "^0.4.7", "angular": "1.4.6", diff --git a/package.json b/package.json index 31c9fb832..e91a32dba 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,10 @@ "unstage-package": "git reset package.json", "clean-all": "git clean -dfx" }, + "engines": { + "node": "6", + "npm": "3" + }, "dependencies": { "pre-commit": "^1.1.3" }, From 8115d156750780c4dc7758a6dd7a372c2b382c51 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 20:18:34 -0400 Subject: [PATCH 3/6] fix(build): only install the fileicon module on macOS --- app-template/build-macos.sh | 3 +++ app-template/package-template.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app-template/build-macos.sh b/app-template/build-macos.sh index f214b1fb4..5f09bd0b2 100755 --- a/app-template/build-macos.sh +++ b/app-template/build-macos.sh @@ -116,6 +116,9 @@ mkdir /Volumes/"${VOL_NAME}"/.background cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/ echo "Adding volume icon to disk image" +# we install this here to avoid trying to install it on linux or windows, where +# it fails to install +npm install fileicon # use fileicon node_module cp "${DMG_VOLUME_ICON}" /Volumes/"${VOL_NAME}"/.VolumeIcon.icns `npm bin`/fileicon set /Volumes/"${VOL_NAME}"/ /Volumes/"${VOL_NAME}"/.VolumeIcon.icns diff --git a/app-template/package-template.json b/app-template/package-template.json index 2ef5e1979..0148205a9 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -118,7 +118,6 @@ "ionic": "^2.1.0", "trash-cli": "^1.4.0", "lodash": "^4.3.0", - "fileicon": "^0.1.8", "pre-commit": "^1.1.3" }, "pre-commit": "unstage-package" From 2a140a7217f01eb418db690111ac0db641b13b24 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 21:06:22 -0400 Subject: [PATCH 4/6] ci(travis): use Trusty to allow secp256k1 to install without C++11 errors --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f405930d0..4ff6026b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: required +dist: trusty language: node_js node_js: - '6' From 58f9afa7ce332482b6f4f4afa1c5b1a57b3740b5 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 21:18:04 -0400 Subject: [PATCH 5/6] fix(test): remove call to deleted test-coveralls task --- app-template/package-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-template/package-template.json b/app-template/package-template.json index 0148205a9..a1d87faf0 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -107,7 +107,7 @@ "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", "apply:copay": "npm i && cd app-template && node apply.js copay && cordova prepare", "apply:bitpay": "npm i && cd app-template && node apply.js bitpay && cordova prepare", - "test": "./node_modules/.bin/grunt test-coveralls", + "test": "echo \"no package tests configured\"", "clean": "trash platforms && trash plugins && cordova prepare", "unstage-package": "git reset package.json", "clean-all": "git clean -dfx" From 24c2809890da6c344e1b8fe8097f32cfbce43340 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Wed, 26 Oct 2016 21:25:35 -0400 Subject: [PATCH 6/6] ci(travis): no coverage is currently being generated --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ff6026b9..4ad45dd71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ before_install: - sh -e /etc/init.d/xvfb start install: - npm run apply:bitpay -after_success: - - npm run exec:coveralls +# after_success: +# - npm run exec:coveralls