From 982c0e11b672949bb5432c62f8e362d87553e6f8 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 1 Feb 2018 13:56:26 +0100 Subject: [PATCH 1/4] Add Travis build steps --- package-lock.json | 71 +++++++++++-------------------------- package.json | 4 +-- scripts/push-precompiled.sh | 5 +++ travis.yml | 14 ++++++++ 4 files changed, 41 insertions(+), 53 deletions(-) create mode 100644 travis.yml diff --git a/package-lock.json b/package-lock.json index b71bfcb..3f32126 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Parity", - "version": "1.9.70", + "version": "1.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -45,11 +45,11 @@ "dev": true }, "@parity/dapp-dapp-methods": { - "version": "github:js-dist-paritytech/dapp-dapp-methods#b4dce52a09303fddf55172bb0d2e6bb83f12e196", + "version": "github:js-dist-paritytech/dapp-dapp-methods#b649fb9056d49bbf4fde719f91a4cfcaf529f9f6", "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.6", + "@parity/mobx": "1.0.7", "@parity/ui": "3.0.22", "mobx": "3.4.1", "mobx-react": "4.3.5", @@ -63,9 +63,9 @@ }, "dependencies": { "@parity/mobx": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.6.tgz", - "integrity": "sha512-yVTB3r/2Uel20aUBgt/x+dlxXrdNuzFjRyo86uR3vWTSFQq5A0H/LzIhlR5JBMuhkGwT6i+t7r1JFG4CoynJew==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz", + "integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==", "dev": true, "requires": { "@parity/ledger": "2.1.2" @@ -128,11 +128,11 @@ } }, "@parity/dapp-dapp-visible": { - "version": "github:js-dist-paritytech/dapp-dapp-visible#19f0b7d3de7bcc9859ac5d8059e866e1f5804366", + "version": "github:js-dist-paritytech/dapp-dapp-visible#28546f312ea9877ebeea9c52afea1e7ec943cd0d", "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.6", + "@parity/mobx": "1.0.7", "@parity/ui": "3.0.22", "mobx": "3.4.1", "mobx-react": "4.3.5", @@ -146,9 +146,9 @@ }, "dependencies": { "@parity/mobx": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.6.tgz", - "integrity": "sha512-yVTB3r/2Uel20aUBgt/x+dlxXrdNuzFjRyo86uR3vWTSFQq5A0H/LzIhlR5JBMuhkGwT6i+t7r1JFG4CoynJew==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz", + "integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==", "dev": true, "requires": { "@parity/ledger": "2.1.2" @@ -231,11 +231,11 @@ "dev": true }, "@parity/dapp-status": { - "version": "github:js-dist-paritytech/dapp-status#90c6425804800b1d3599f602cd257e8e4cfa6428", + "version": "github:js-dist-paritytech/dapp-status#ea6a3c01d64bd57c5fadf2264efa719a61e70a29", "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.6", + "@parity/mobx": "1.0.7", "@parity/ui": "3.0.22", "format-number": "3.0.0", "mobx": "3.4.1", @@ -251,9 +251,9 @@ }, "dependencies": { "@parity/mobx": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.6.tgz", - "integrity": "sha512-yVTB3r/2Uel20aUBgt/x+dlxXrdNuzFjRyo86uR3vWTSFQq5A0H/LzIhlR5JBMuhkGwT6i+t7r1JFG4CoynJew==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz", + "integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==", "dev": true, "requires": { "@parity/ledger": "2.1.2" @@ -361,9 +361,9 @@ "version": "github:parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c" }, "@parity/shared": { - "version": "2.2.21", - "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.2.21.tgz", - "integrity": "sha512-8Xuuv/SpS+lviX3xRVvh3UUMcWYrQPQvn+KkSiKofuHlVL/IlhEnLyflk5j5FgGviXwaqBxmOllTSTPQBna4Gw==", + "version": "2.2.23", + "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.2.23.tgz", + "integrity": "sha512-I9/uk2g2V6vm1SvsopGassY5QvW/5DMNvha5isoCRdFWnAq2EKOCeSH+pbZXx0ZzHCIgSDlFXPTaaWDbvngBzA==", "requires": { "@parity/ledger": "2.1.2", "eventemitter3": "2.0.3", @@ -415,37 +415,6 @@ "loose-envify": "1.3.1", "symbol-observable": "1.1.0" } - }, - "solc": { - "version": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818", - "requires": { - "memorystream": "0.3.1", - "require-from-string": "1.2.1", - "yargs": "4.8.1" - }, - "dependencies": { - "yargs": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", - "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", - "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "lodash.assign": "4.2.0", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "window-size": "0.2.0", - "y18n": "3.2.1", - "yargs-parser": "2.4.1" - } - } - } } } }, @@ -457,7 +426,7 @@ "@parity/api": "2.1.15", "@parity/etherscan": "2.1.3", "@parity/mobx": "1.0.4", - "@parity/shared": "2.2.21", + "@parity/shared": "2.2.23", "babel-runtime": "6.26.0", "bignumber.js": "4.1.0", "brace": "0.11.0", diff --git a/package.json b/package.json index fa78c88..5614379 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Parity", - "version": "1.9.70", + "version": "1.10.0", "main": "src/index.parity.js", "jsnext:main": "src/index.parity.js", "author": "Parity Team ", @@ -146,7 +146,7 @@ "@parity/plugin-signer-default": "parity-js/plugin-signer-default#9a47bded9d6d70b69bb2f719732bd6f7854d1842", "@parity/plugin-signer-hardware": "parity-js/plugin-signer-hardware#4320d818a053d4efae890b74a7476e4c8dc6ba10", "@parity/plugin-signer-qr": "parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c", - "@parity/shared": "2.2.21", + "@parity/shared": "2.2.23", "@parity/ui": "3.0.22", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", diff --git a/scripts/push-precompiled.sh b/scripts/push-precompiled.sh index bd26e14..a3d2149 100755 --- a/scripts/push-precompiled.sh +++ b/scripts/push-precompiled.sh @@ -1,6 +1,11 @@ #!/bin/bash set -e +if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then + echo "Not on master branch, skipping precompiled update" + exit 0 +fi + # variables PVER="1-9" PTYPE="shell" diff --git a/travis.yml b/travis.yml new file mode 100644 index 0000000..a26634d --- /dev/null +++ b/travis.yml @@ -0,0 +1,14 @@ +language: node_js +node_js: + - "8" +cache: + yarn: true + directories: + - node_modules +before_install: + - npm install --global yarn --cache-min 999999999 +install: + - npm install +script: + - npm run ci:build + - ./scripts/push-precompiled.sh -- GitLab From a2a0294f31720ee2fd65202a61ce28339f055d85 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 1 Feb 2018 14:00:19 +0100 Subject: [PATCH 2/4] Update version identifier --- scripts/push-precompiled.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/push-precompiled.sh b/scripts/push-precompiled.sh index a3d2149..9489cd0 100755 --- a/scripts/push-precompiled.sh +++ b/scripts/push-precompiled.sh @@ -7,7 +7,7 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then fi # variables -PVER="1-9" +PVER="1-10" PTYPE="shell" UTCDATE=`date -u "+%Y%m%d-%H%M%S"` PRE_REPO="js-dist-paritytech/parity-${CI_BUILD_REF_NAME}-${PVER}-${PTYPE}.git" -- GitLab From b000ee7c4c3b58cd29534dce076c76fd50cedffa Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 1 Feb 2018 14:02:46 +0100 Subject: [PATCH 3/4] Add linting to Travis --- travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis.yml b/travis.yml index a26634d..c754ec4 100644 --- a/travis.yml +++ b/travis.yml @@ -10,5 +10,6 @@ before_install: install: - npm install script: + - npm run lint - npm run ci:build - ./scripts/push-precompiled.sh -- GitLab From 0a1b3e75a2c631f173688291773aa6cb310a29a7 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 1 Feb 2018 14:07:15 +0100 Subject: [PATCH 4/4] travis.yml -> .travis.yml --- travis.yml => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.yml => .travis.yml (100%) diff --git a/travis.yml b/.travis.yml similarity index 100% rename from travis.yml rename to .travis.yml -- GitLab