From 3a700dae6489659ae606054be92acd95c2cf0710 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:09:16 -0300 Subject: [PATCH 01/92] Circle ci test --- .circleci/config.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..598b63bf0 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,42 @@ +# Javascript Node CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-javascript/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/node:8.9 + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/mist + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + - run: export PATH=$PATH:`yarn global bin` + - run: yarn global add gulp-cli meteor-build-client electron@1.8.2 + - run: yarn install + + - save_cache: + paths: + - node_modules + key: v1-dependencies-{{ checksum "package.json" }} + + # run tests! + - run: yarn test:unit:once + - run: gulp --linux + - run: gulp test From 6657c4463353410afb178d215ba36ae7957ea6f6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:29:32 -0300 Subject: [PATCH 02/92] Regular meteor installation --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 598b63bf0..dd4055a94 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,8 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + - run: meteor || curl https://install.meteor.com | /bin/sh; cat /home/circleci/.npm/_logs/* - run: export PATH=$PATH:`yarn global bin` - run: yarn global add gulp-cli meteor-build-client electron@1.8.2 - run: yarn install From 06ab8a76ce1d332858f0ca7455ca39cce41a9c80 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:32:53 -0300 Subject: [PATCH 03/92] Removing debug --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd4055a94..34232af4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,9 +27,9 @@ jobs: - v1-dependencies- # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - run: meteor || curl https://install.meteor.com | /bin/sh; cat /home/circleci/.npm/_logs/* + - run: meteor || curl https://install.meteor.com | /bin/sh - run: export PATH=$PATH:`yarn global bin` - - run: yarn global add gulp-cli meteor-build-client electron@1.8.2 + - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 - run: yarn install - save_cache: From 965f65468ecefd72c23ab68a5fa25d6977605226 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:39:42 -0300 Subject: [PATCH 04/92] Adding Gulp via npm i --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34232af4f..7ab0b196d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,8 +29,9 @@ jobs: # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: meteor || curl https://install.meteor.com | /bin/sh - run: export PATH=$PATH:`yarn global bin` - - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 - - run: yarn install + - run: npm install -g gulp-cli + - run: yarn global add meteor-build-client electron@1.8.3 + - run: yarn - save_cache: paths: From 802affd0f7857bd638a9f575307e7e2a6a1949a7 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:50:59 -0300 Subject: [PATCH 05/92] Debugs yarn gulp-cli --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ab0b196d..c665a9b99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,9 +29,11 @@ jobs: # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: meteor || curl https://install.meteor.com | /bin/sh - run: export PATH=$PATH:`yarn global bin` - - run: npm install -g gulp-cli + - run: yarn global bin + - run: echo $PATH + - run: yarn global add gulp-cli - run: yarn global add meteor-build-client electron@1.8.3 - - run: yarn + - run: yarn install - save_cache: paths: From 57007b6213b95be7d074b8906f9757a0f54e7dda Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 01:59:19 -0300 Subject: [PATCH 06/92] Debugging yarn global bin --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c665a9b99..cbbac9d2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,13 +26,19 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - run: meteor || curl https://install.meteor.com | /bin/sh - - run: export PATH=$PATH:`yarn global bin` + # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: yarn global bin + - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - run: echo $PATH + - run: cat `echo $BASH_ENV` + - run: yarn global add gulp-cli - run: yarn global add meteor-build-client electron@1.8.3 + - run: ls -la `yarn global bin` + + # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + - run: meteor || curl https://install.meteor.com | /bin/sh + - run: yarn install - save_cache: From 2a343baad950f3e0f5c34d1f6514d60a1bcb8848 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 02:10:31 -0300 Subject: [PATCH 07/92] node-gyp tentative fix --- .circleci/config.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbbac9d2b..0ebc90732 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,14 +27,13 @@ jobs: - v1-dependencies- # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - - run: yarn global bin - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - - run: echo $PATH - - run: cat `echo $BASH_ENV` - - run: yarn global add gulp-cli - - run: yarn global add meteor-build-client electron@1.8.3 - - run: ls -la `yarn global bin` + # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 + - run: export CXX_host="g++ -m32" + + # Adding global dependencies + - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: meteor || curl https://install.meteor.com | /bin/sh From ffb83238d1b7c321ab4929965f22327724396f09 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 02:32:12 -0300 Subject: [PATCH 08/92] Debugging node-gyp --- .circleci/config.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ebc90732..c8aa5c162 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,11 @@ jobs: # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: export CXX_host="g++ -m32" + # Debug node-gyp with sha3@1.2.0 + - run: yarn global add node-gyp + - run: node-gyp --version + - run: yarn add sha3@1.2.0 + # Adding global dependencies - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 @@ -40,6 +45,9 @@ jobs: - run: yarn install + + + - save_cache: paths: - node_modules @@ -47,5 +55,5 @@ jobs: # run tests! - run: yarn test:unit:once - - run: gulp --linux + - run: gulp --linux || cat /home/circleci/.npm/_logs/* - run: gulp test From c2ba7361737d0a0d4f83d1763b58f6257d2648de Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 02:41:56 -0300 Subject: [PATCH 09/92] Debugging python version --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c8aa5c162..cc20de0cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,6 +19,8 @@ jobs: steps: - checkout + - run: python --version + # Download and cache dependencies - restore_cache: keys: From 442116eaffa42c66614e30981b285374ef559256 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 12 Mar 2018 02:48:20 -0300 Subject: [PATCH 10/92] Logging regardless of return code of previous command --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc20de0cc..9cfd3df81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - checkout - run: python --version - + # Download and cache dependencies - restore_cache: keys: @@ -47,9 +47,6 @@ jobs: - run: yarn install - - - - save_cache: paths: - node_modules @@ -57,5 +54,5 @@ jobs: # run tests! - run: yarn test:unit:once - - run: gulp --linux || cat /home/circleci/.npm/_logs/* + - run: gulp --linux; cat /home/circleci/.npm/_logs/* - run: gulp test From 1b9afd92b2e3daa6ff53e22def8e39bc8aebcbfe Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 13 Mar 2018 18:45:28 -0300 Subject: [PATCH 11/92] removing part of postinstall hook --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 002be6651..cd835c4e2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/ethereum/mist.git" }, "scripts": { - "postinstall": "electron-builder install-app-deps; cd interface && yarn", + "postinstall": "electron-builder install-app-deps", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "open http://remotedev.io/local/", From 208dfd147f52dd41d29b8235d2e8e49d6e9f7dc1 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 13 Mar 2018 19:43:36 -0300 Subject: [PATCH 12/92] Tentative fix for 32bit builds --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cfd3df81..c5468e41e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,10 +34,8 @@ jobs: # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: export CXX_host="g++ -m32" - # Debug node-gyp with sha3@1.2.0 - - run: yarn global add node-gyp - - run: node-gyp --version - - run: yarn add sha3@1.2.0 + # Installing multilib (build for 32 and 64 architectures) + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib # Adding global dependencies - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 @@ -45,7 +43,7 @@ jobs: # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: meteor || curl https://install.meteor.com | /bin/sh - - run: yarn install + - run: yarn - save_cache: paths: From 5f66ef425b463918b74bafaa9649b85a9a54124e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 13 Mar 2018 19:55:17 -0300 Subject: [PATCH 13/92] Adding to-dos; Removing debug --- .circleci/config.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5468e41e..ebdd110ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,11 @@ +# +# TODO: group into `dependencies`, `build` and `test` keys +# TODO: name commands properly +# TODO: store_artifacts +# TODO: store_test_results +# TODO: one docker image per arch +# + # Javascript Node CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-javascript/ for more details @@ -6,7 +14,6 @@ version: 2 jobs: build: docker: - # specify the version you desire here - image: circleci/node:8.9 # Specify service dependencies here if necessary @@ -34,7 +41,7 @@ jobs: # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: export CXX_host="g++ -m32" - # Installing multilib (build for 32 and 64 architectures) + # Installing multilib (build for 32 and 64 architectures): https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib # Adding global dependencies @@ -52,5 +59,5 @@ jobs: # run tests! - run: yarn test:unit:once - - run: gulp --linux; cat /home/circleci/.npm/_logs/* + - run: gulp --linux - run: gulp test From 2f4426f0f2ac16dbfaf53dc97374905f66645665 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 14 Mar 2018 00:32:17 -0300 Subject: [PATCH 14/92] xvfb-run config --- .circleci/config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ebdd110ff..662dab7d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,10 @@ # TODO: store_artifacts # TODO: store_test_results # TODO: one docker image per arch +# TODO: improve caching +# TODO: mac job +# TODO: windows job +# TODO: build .deb or .AppImage # # Javascript Node CircleCI 2.0 configuration file @@ -41,6 +45,9 @@ jobs: # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: export CXX_host="g++ -m32" + # Video config for testing + # - run: export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start + # Installing multilib (build for 32 and 64 architectures): https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib @@ -60,4 +67,4 @@ jobs: # run tests! - run: yarn test:unit:once - run: gulp --linux - - run: gulp test + - run: xvfb-run gulp test From 826bcee26f429b6c1f22b6684d923480a00e9577 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 16 Mar 2018 20:33:22 -0300 Subject: [PATCH 15/92] Using node 8.9.4 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 662dab7d1..6437e1a14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:8.9 + - image: circleci/node:8.9.4 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -30,6 +30,7 @@ jobs: steps: - checkout + # DEBUG: node-gyp uses python - run: python --version # Download and cache dependencies From b8b9838c8365998708ecf7bb844a7150b6199105 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 13:35:00 -0300 Subject: [PATCH 16/92] Sequential jobs --- .circleci/config.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6437e1a14..d840d7ed7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,5 @@ # +# TODO: fix `xvfb gulp test` command # TODO: group into `dependencies`, `build` and `test` keys # TODO: name commands properly # TODO: store_artifacts @@ -60,12 +61,23 @@ jobs: - run: yarn + - run: gulp --linux + - save_cache: paths: - node_modules key: v1-dependencies-{{ checksum "package.json" }} - - # run tests! + test: + docker: + - image: circleci/node:8.9.4 + steps: - run: yarn test:unit:once - - run: gulp --linux - run: xvfb-run gulp test + + +workflow: + version: 2 + build_and_test: + - build + - test + From 421b1ca5dd3489fb5c535340f54205fbf095208d Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 15:16:00 -0300 Subject: [PATCH 17/92] Fix meteor install statement; Enabling CircleCI workflow --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d840d7ed7..163651464 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - run: meteor || curl https://install.meteor.com | /bin/sh + - run: which meteor || curl https://install.meteor.com | /bin/sh - run: yarn @@ -75,7 +75,7 @@ jobs: - run: xvfb-run gulp test -workflow: +workflows: version: 2 build_and_test: - build From 79dbd1b50b52850b046940e3c30a8b50c6aba22b Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 15:24:23 -0300 Subject: [PATCH 18/92] Enabling CircleCI workflow --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 163651464..ae9a4c322 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,6 +78,7 @@ jobs: workflows: version: 2 build_and_test: - - build - - test + jobs: + - build + - test From 342e78fe9a2c9f8c27ae909f10d3938c58c01396 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 19:04:17 -0300 Subject: [PATCH 19/92] Adding jobs to the workflow --- .circleci/config.yml | 63 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae9a4c322..8d4622db2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,32 +53,77 @@ jobs: # Installing multilib (build for 32 and 64 architectures): https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib - # Adding global dependencies - - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 - # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: which meteor || curl https://install.meteor.com | /bin/sh + + # Adding global dependencies + - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 - run: yarn - - run: gulp --linux - - save_cache: paths: - node_modules key: v1-dependencies-{{ checksum "package.json" }} - test: + - persist_to_workspace: + root: /home/circleci/mist/ + + build-mist: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp --linux + + build-wallet: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp --wallet --linux + + spectron-test: docker: - image: circleci/node:8.9.4 steps: - - run: yarn test:unit:once - run: xvfb-run gulp test + unit-test: + docker: + - image: circleci/node:8.9.4 + steps: + - run: yarn test:unit:once + + verify-artifacts-mist: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp verify-artifacts --mist --linux + + verify-artifacts-wallet: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp verify-artifacts --wallet --linux workflows: version: 2 build_and_test: jobs: - build - - test - + - build-mist: + requires: + - build + - build-wallet: + requires: + - build + - spectron-test: + requires: + - build-mist + - unit-test: + requires: + - build-mist + - verify-artifacts-mist: + requires: + - build-mist + - verify-artifacts-wallet: + requires: + - build-wallet From 4c7f470b43c83b8d5cf3e4ee379c81f1eb29cda1 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 19:22:55 -0300 Subject: [PATCH 20/92] Config tweak --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d4622db2..868e2e339 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,7 +66,7 @@ jobs: - node_modules key: v1-dependencies-{{ checksum "package.json" }} - persist_to_workspace: - root: /home/circleci/mist/ + root: /home/circleci/mist/ build-mist: docker: From 845b68d2b61acadcb0d79eca552414d12f000498 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 20:04:56 -0300 Subject: [PATCH 21/92] Simplifying circleci config --- .circleci/config.yml | 46 +------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 868e2e339..e63727af2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 - working_directory: ~/mist + working_directory: /home/circleci/mist steps: - checkout @@ -74,35 +74,6 @@ jobs: steps: - run: gulp --linux - build-wallet: - docker: - - image: circleci/node:8.9.4 - steps: - - run: gulp --wallet --linux - - spectron-test: - docker: - - image: circleci/node:8.9.4 - steps: - - run: xvfb-run gulp test - - unit-test: - docker: - - image: circleci/node:8.9.4 - steps: - - run: yarn test:unit:once - - verify-artifacts-mist: - docker: - - image: circleci/node:8.9.4 - steps: - - run: gulp verify-artifacts --mist --linux - - verify-artifacts-wallet: - docker: - - image: circleci/node:8.9.4 - steps: - - run: gulp verify-artifacts --wallet --linux workflows: version: 2 @@ -112,18 +83,3 @@ workflows: - build-mist: requires: - build - - build-wallet: - requires: - - build - - spectron-test: - requires: - - build-mist - - unit-test: - requires: - - build-mist - - verify-artifacts-mist: - requires: - - build-mist - - verify-artifacts-wallet: - requires: - - build-wallet From cc464a214dde9a2257cbfbd8b2ba04ceea386d7e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 20:18:54 -0300 Subject: [PATCH 22/92] Simplifying circleci config --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e63727af2..476e53f1d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,6 +80,3 @@ workflows: build_and_test: jobs: - build - - build-mist: - requires: - - build From 2239e8e8b1bc5dd4b3c883eeb8ebe1a68e0282ce Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 20:29:14 -0300 Subject: [PATCH 23/92] Build fan-out fan-in --- .circleci/config.yml | 65 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 476e53f1d..c09f339e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,7 +66,9 @@ jobs: - node_modules key: v1-dependencies-{{ checksum "package.json" }} - persist_to_workspace: - root: /home/circleci/mist/ + root: /home/circleci/ + paths: + - mist build-mist: docker: @@ -74,9 +76,70 @@ jobs: steps: - run: gulp --linux + build-wallet: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp --wallet --linux + + spectron-test: + docker: + - image: circleci/node:8.9.4 + steps: + - run: xvfb-run gulp test + + unit-test: + docker: + - image: circleci/node:8.9.4 + steps: + - run: yarn test:unit:once + + verify-artifacts-mist: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp verify-artifacts --mist --linux + + verify-artifacts-wallet: + docker: + - image: circleci/node:8.9.4 + steps: + - run: gulp verify-artifacts --wallet --linux + + github-release: + docker: + - image: circleci/node:8.9.4 + steps: + - run: echo "Mocking githug release!" workflows: version: 2 build_and_test: jobs: - build + - build-mist: + requires: + - build + - build-wallet: + requires: + - build + - spectron-test: + requires: + - build-mist + - unit-test: + requires: + - build-mist + - verify-artifacts-mist: + requires: + - build-mist + - verify-artifacts-wallet: + requires: + - build-wallet + - github-release: + requires: + - spectron-test + - unit-test + - verify-artifacts-mist + - verify-artifacts-wallet + + From b9835dfa46b07ad582887fe9a743f8b12201b4c9 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 20:46:14 -0300 Subject: [PATCH 24/92] Attaching jobs to workspace --- .circleci/config.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c09f339e7..c1d9a2b6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,42 +73,56 @@ jobs: build-mist: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: gulp --linux build-wallet: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: gulp --wallet --linux spectron-test: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: xvfb-run gulp test unit-test: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: yarn test:unit:once verify-artifacts-mist: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: gulp verify-artifacts --mist --linux verify-artifacts-wallet: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: gulp verify-artifacts --wallet --linux github-release: docker: - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ steps: - run: echo "Mocking githug release!" From 45439021b8da56555a641942e8cf52e6d8997579 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 29 Jun 2018 22:55:49 -0300 Subject: [PATCH 25/92] Debugging workspace attachment --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1d9a2b6a..946a2974f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,6 +76,10 @@ jobs: attach_workspace: at: /home/circleci/ steps: + - run: pwd + - run: cd mist + - run: ls -R + - run: npm i -g gulp - run: gulp --linux build-wallet: @@ -124,7 +128,7 @@ jobs: attach_workspace: at: /home/circleci/ steps: - - run: echo "Mocking githug release!" + - run: echo "Mocking github release!" workflows: version: 2 From a55603767f307d5c1cbc16cc7e5fdc5e92ec905d Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 2 Jul 2018 17:14:11 -0300 Subject: [PATCH 26/92] Removing debug statement --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 946a2974f..7c004592c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,9 +31,6 @@ jobs: steps: - checkout - # DEBUG: node-gyp uses python - - run: python --version - # Download and cache dependencies - restore_cache: keys: From c80480c64952593e5e016b4b929e1168b97e42d6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 2 Jul 2018 17:42:29 -0300 Subject: [PATCH 27/92] Merging tasks --- .circleci/config.yml | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c004592c..3ac9d16c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,5 @@ # +# TODO: persist and recover from workspace # TODO: fix `xvfb gulp test` command # TODO: group into `dependencies`, `build` and `test` keys # TODO: name commands properly @@ -8,7 +9,6 @@ # TODO: improve caching # TODO: mac job # TODO: windows job -# TODO: build .deb or .AppImage # # Javascript Node CircleCI 2.0 configuration file @@ -103,22 +103,6 @@ jobs: steps: - run: yarn test:unit:once - verify-artifacts-mist: - docker: - - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ - steps: - - run: gulp verify-artifacts --mist --linux - - verify-artifacts-wallet: - docker: - - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ - steps: - - run: gulp verify-artifacts --wallet --linux - github-release: docker: - image: circleci/node:8.9.4 @@ -126,6 +110,8 @@ jobs: at: /home/circleci/ steps: - run: echo "Mocking github release!" + - run: gulp verify-artifacts --wallet --linux + - run: gulp verify-artifacts --mist --linux workflows: version: 2 @@ -144,17 +130,9 @@ workflows: - unit-test: requires: - build-mist - - verify-artifacts-mist: - requires: - - build-mist - - verify-artifacts-wallet: - requires: - - build-wallet - github-release: requires: - spectron-test - unit-test - - verify-artifacts-mist - - verify-artifacts-wallet From 01b87be9a06f8d1c668695b483f2584d8e59fdfc Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 21:52:06 -0300 Subject: [PATCH 28/92] Adding more debug statements --- .circleci/config.yml | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ac9d16c2..b1b029cd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,18 +74,19 @@ jobs: at: /home/circleci/ steps: - run: pwd - - run: cd mist - run: ls -R - run: npm i -g gulp - run: gulp --linux + - run: gulp verify-artifacts --mist --linux build-wallet: docker: - image: circleci/node:8.9.4 attach_workspace: - at: /home/circleci/ + at: /home/circleci/mist steps: - run: gulp --wallet --linux + - run: gulp verify-artifacts --wallet --linux spectron-test: docker: @@ -109,9 +110,30 @@ jobs: attach_workspace: at: /home/circleci/ steps: - - run: echo "Mocking github release!" - - run: gulp verify-artifacts --wallet --linux - - run: gulp verify-artifacts --mist --linux + - run: gulp upload-queue --linux + - run: gulp upload-queue --wallet --linux + + workspace-save: + docker: + - image: circleci/node:8.9.4 + steps: + - run: mkdir my-repo + - run: echo "debug info" >> my-repo/file.txt + - run: pwd + persist_to_workspace: + - root: /home/circleci + - paths: my-repo + + workspace-attach: + docker: + - image: circleci/node:8.9.4 + attach_workspace: + at: /home/circleci/ + steps: + - run: pwd + - run: ls -R + - run: cat my-repo/file.txt + workflows: version: 2 @@ -129,10 +151,13 @@ workflows: - build-mist - unit-test: requires: - - build-mist + - build - github-release: requires: - spectron-test - unit-test - - + - build-wallet + - workspace-save + - workspace-attach: + requires: + - workspace-save From 5e24f65bfb9b0f08084c492250b48655fbd7b298 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:21:09 -0300 Subject: [PATCH 29/92] workspace paths --- .circleci/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1b029cd2..3dbd8a9dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,6 +72,7 @@ jobs: - image: circleci/node:8.9.4 attach_workspace: at: /home/circleci/ + working_directory: /home/circleci/mist steps: - run: pwd - run: ls -R @@ -84,6 +85,7 @@ jobs: - image: circleci/node:8.9.4 attach_workspace: at: /home/circleci/mist + working_directory: /home/circleci/mist steps: - run: gulp --wallet --linux - run: gulp verify-artifacts --wallet --linux @@ -120,9 +122,9 @@ jobs: - run: mkdir my-repo - run: echo "debug info" >> my-repo/file.txt - run: pwd - persist_to_workspace: - - root: /home/circleci - - paths: my-repo + - persist_to_workspace: + root: /home/circleci + paths: my-repo workspace-attach: docker: From 483b135afb273d9954d8ff56db82ac05ca3abaca Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:22:38 -0300 Subject: [PATCH 30/92] Config --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dbd8a9dd..1615c730c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,8 +123,8 @@ jobs: - run: echo "debug info" >> my-repo/file.txt - run: pwd - persist_to_workspace: - root: /home/circleci - paths: my-repo + root: /home/circleci + paths: my-repo workspace-attach: docker: From 043f7ac8255e3afc5256fb92f8012632192fc7c9 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:27:00 -0300 Subject: [PATCH 31/92] Config --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1615c730c..34ea7ee49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,11 @@ # TODO: windows job # +defaults: + docker: + - image: circleci/node:8.9.4 + working_directory: /home/circleci/mist + # Javascript Node CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-javascript/ for more details @@ -118,6 +123,7 @@ jobs: workspace-save: docker: - image: circleci/node:8.9.4 + working_directory: /home/circleci/mist steps: - run: mkdir my-repo - run: echo "debug info" >> my-repo/file.txt @@ -129,6 +135,7 @@ jobs: workspace-attach: docker: - image: circleci/node:8.9.4 + working_directory: /home/circleci/mist attach_workspace: at: /home/circleci/ steps: From 349a7360fcbfd8a49164eedf6a911a9e32a3c83c Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:31:55 -0300 Subject: [PATCH 32/92] Config --- .circleci/config.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34ea7ee49..965d901f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,12 +125,14 @@ jobs: - image: circleci/node:8.9.4 working_directory: /home/circleci/mist steps: - - run: mkdir my-repo - - run: echo "debug info" >> my-repo/file.txt + - run: mkdir dist_files + - run: echo "debug info" >> dist_files/file.txt + - run: echo "src files" >> index.js - run: pwd + - run: ls -lR - persist_to_workspace: - root: /home/circleci - paths: my-repo + root: /home/circleci/ + paths: mist workspace-attach: docker: @@ -141,7 +143,6 @@ jobs: steps: - run: pwd - run: ls -R - - run: cat my-repo/file.txt workflows: From c400f6a1aa8f97d3154a6c57457fa396bd8f71e8 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:46:23 -0300 Subject: [PATCH 33/92] Config --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 965d901f8..31d8d3908 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -137,7 +137,6 @@ jobs: workspace-attach: docker: - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist attach_workspace: at: /home/circleci/ steps: From d5316c5ad1cbe4d0f9fa880681769c1afd6faf12 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:50:53 -0300 Subject: [PATCH 34/92] Config --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31d8d3908..8a20adef8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,10 +75,10 @@ jobs: build-mist: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ working_directory: /home/circleci/mist steps: + - attach_workspace: + at: /home/circleci/ - run: pwd - run: ls -R - run: npm i -g gulp @@ -88,35 +88,35 @@ jobs: build-wallet: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/mist working_directory: /home/circleci/mist steps: + - attach_workspace: + at: /home/circleci/mist - run: gulp --wallet --linux - run: gulp verify-artifacts --wallet --linux spectron-test: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ steps: + - attach_workspace: + at: /home/circleci/ - run: xvfb-run gulp test unit-test: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ steps: + - attach_workspace: + at: /home/circleci/ - run: yarn test:unit:once github-release: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ steps: + - attach_workspace: + at: /home/circleci/ - run: gulp upload-queue --linux - run: gulp upload-queue --wallet --linux @@ -137,9 +137,9 @@ jobs: workspace-attach: docker: - image: circleci/node:8.9.4 - attach_workspace: - at: /home/circleci/ steps: + - attach_workspace: + at: /home/circleci/ - run: pwd - run: ls -R From f2584196440be1ae93858f1b626f3f2916693e26 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 22:54:40 -0300 Subject: [PATCH 35/92] Config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a20adef8..61d65989b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,7 +139,7 @@ jobs: - image: circleci/node:8.9.4 steps: - attach_workspace: - at: /home/circleci/ + at: /home/circleci/ - run: pwd - run: ls -R From 38bd33251d93d7d54ef117bf9cf01f88df559706 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 23:16:27 -0300 Subject: [PATCH 36/92] Config --- .circleci/config.yml | 47 +++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61d65989b..0eaaf2990 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,10 +11,10 @@ # TODO: windows job # -defaults: +defaults: &defaults + working_directory: /home/circleci/mist docker: - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist # Javascript Node CircleCI 2.0 configuration file # @@ -23,16 +23,7 @@ defaults: version: 2 jobs: build: - docker: - - image: circleci/node:8.9.4 - - # Specify service dependencies here if necessary - # CircleCI maintains a library of pre-built images - # documented at https://circleci.com/docs/2.0/circleci-images/ - # - image: circleci/mongo:3.4.4 - - working_directory: /home/circleci/mist - + <<: *defaults steps: - checkout @@ -45,8 +36,8 @@ jobs: # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV + # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: export CXX_host="g++ -m32" # Video config for testing @@ -73,27 +64,30 @@ jobs: - mist build-mist: - docker: - - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist + <<: *defaults steps: - attach_workspace: at: /home/circleci/ - run: pwd - run: ls -R - - run: npm i -g gulp - - run: gulp --linux - - run: gulp verify-artifacts --mist --linux + - run: yarn run gulp --linux + - run: yarn run gulp verify-artifacts --mist --linux + - persist_to_workspace: + root: /home/circleci/ + paths: + - mist/dist_mist build-wallet: - docker: - - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist + <<: *defaults steps: - attach_workspace: at: /home/circleci/mist - run: gulp --wallet --linux - run: gulp verify-artifacts --wallet --linux + - persist_to_workspace: + root: /home/circleci/ + paths: + - mist/dist_wallet spectron-test: docker: @@ -101,19 +95,17 @@ jobs: steps: - attach_workspace: at: /home/circleci/ - - run: xvfb-run gulp test + - run: xvfb-run yarn run gulp test unit-test: - docker: - - image: circleci/node:8.9.4 + <<: *defaults steps: - attach_workspace: at: /home/circleci/ - run: yarn test:unit:once github-release: - docker: - - image: circleci/node:8.9.4 + <<: *defaults steps: - attach_workspace: at: /home/circleci/ @@ -137,6 +129,7 @@ jobs: workspace-attach: docker: - image: circleci/node:8.9.4 + working_directory: /home/circleci/mist steps: - attach_workspace: at: /home/circleci/ From f90df79fe42254ad0d6197df4a112dab259aa5c5 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 23:45:59 -0300 Subject: [PATCH 37/92] Config: using yarn to run scripts --- .circleci/config.yml | 6 ++++-- gulpTasks/building.js | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0eaaf2990..2e8acac84 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ jobs: at: /home/circleci/ - run: pwd - run: ls -R + - run: which meteor || curl https://install.meteor.com | /bin/sh - run: yarn run gulp --linux - run: yarn run gulp verify-artifacts --mist --linux - persist_to_workspace: @@ -82,8 +83,9 @@ jobs: steps: - attach_workspace: at: /home/circleci/mist - - run: gulp --wallet --linux - - run: gulp verify-artifacts --wallet --linux + - run: which meteor || curl https://install.meteor.com | /bin/sh + - run: yarn run gulp --wallet --linux + - run: yarn run gulp verify-artifacts --wallet --linux - persist_to_workspace: root: /home/circleci/ paths: diff --git a/gulpTasks/building.js b/gulpTasks/building.js index cf6eba58b..58ed95b9a 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -81,7 +81,7 @@ gulp.task('pack-wallet', cb => { exec( `git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git && \ cd meteor-dapp-wallet/app && \ - npm install && \ + yarn & \ ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, (err, stdout, stderr) => { console.log(stdout, stderr); @@ -113,7 +113,7 @@ gulp.task('bundling-interface', cb => { if (options.walletSource === 'local') { console.log('Use local wallet at ../meteor-dapp-wallet/app'); bundle(`&& cd ../../meteor-dapp-wallet/app \ - && npm install \ + && yarn \ && ../../../node_modules/.bin/meteor-build-client ../../mist/dist_${type}/app/interface/wallet -p ""`); } else { console.log( @@ -124,7 +124,7 @@ gulp.task('bundling-interface', cb => { bundle(`&& cd ../dist_${type} \ && git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git \ && cd meteor-dapp-wallet/app \ - && npm install \ + && yarn \ && ../../../node_modules/.bin/meteor-build-client ../../app/interface/wallet -p "" \ && cd ../../ \ && rm -rf meteor-dapp-wallet`); From f3c8897a6387eafd6aa8cfaf51b6b59152d82a32 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 3 Jul 2018 23:57:44 -0300 Subject: [PATCH 38/92] Config: yarn global; storing artifacts --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e8acac84..bab3dbe0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,8 +71,11 @@ jobs: - run: pwd - run: ls -R - run: which meteor || curl https://install.meteor.com | /bin/sh + - run: sudo yarn global add meteor-build-client - run: yarn run gulp --linux - run: yarn run gulp verify-artifacts --mist --linux + - store_artifacts: + path: dist_mist/release - persist_to_workspace: root: /home/circleci/ paths: @@ -84,8 +87,11 @@ jobs: - attach_workspace: at: /home/circleci/mist - run: which meteor || curl https://install.meteor.com | /bin/sh + - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux - run: yarn run gulp verify-artifacts --wallet --linux + - store_artifacts: + path: dist_mist/release - persist_to_workspace: root: /home/circleci/ paths: From 02937e02c6c6c05246157ea4dbcf39bfe5d87981 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 01:00:18 -0300 Subject: [PATCH 39/92] Config: fixing shell command --- gulpTasks/building.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 58ed95b9a..3fe70d979 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -79,10 +79,10 @@ gulp.task('pack-wallet', cb => { del(['./wallet', './meteor-dapp-wallet']).then(() => { console.log('Building wallet...'); exec( - `git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git && \ - cd meteor-dapp-wallet/app && \ - yarn & \ - ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, + `git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git \ + && cd meteor-dapp-wallet/app \ + && yarn install \ + && ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, (err, stdout, stderr) => { console.log(stdout, stderr); del(['./meteor-dapp-wallet']); From 6b5536290d14f5c1221a20be91d86fa305f07bed Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 01:25:17 -0300 Subject: [PATCH 40/92] Config: fixing wallet path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bab3dbe0c..e28b7a3fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,7 +85,7 @@ jobs: <<: *defaults steps: - attach_workspace: - at: /home/circleci/mist + at: /home/circleci/ - run: which meteor || curl https://install.meteor.com | /bin/sh - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux From 04b50e9e1e4d022ab289013dc436cb8ab0d7d4b6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 01:53:05 -0300 Subject: [PATCH 41/92] Config: env variable for compile flag --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e28b7a3fe..032cc500d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,8 @@ defaults: &defaults working_directory: /home/circleci/mist docker: - image: circleci/node:8.9.4 + - environment: + - CXX_host: 'g++ -m32' # Javascript Node CircleCI 2.0 configuration file # @@ -38,7 +40,7 @@ jobs: - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - - run: export CXX_host="g++ -m32" + - run: echo $CXX_host # Video config for testing # - run: export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start @@ -68,6 +70,7 @@ jobs: steps: - attach_workspace: at: /home/circleci/ + - run: echo $CXX_host - run: pwd - run: ls -R - run: which meteor || curl https://install.meteor.com | /bin/sh @@ -86,6 +89,7 @@ jobs: steps: - attach_workspace: at: /home/circleci/ + - run: echo $CXX_host - run: which meteor || curl https://install.meteor.com | /bin/sh - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux From 932e64eb4d452756c5e9eaa2144e98ca5bc98449 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 01:56:09 -0300 Subject: [PATCH 42/92] Config: env variable for compile flag --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 032cc500d..141514c5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,8 +15,8 @@ defaults: &defaults working_directory: /home/circleci/mist docker: - image: circleci/node:8.9.4 - - environment: - - CXX_host: 'g++ -m32' + environment: + - CXX_host: 'g++ -m32' # Javascript Node CircleCI 2.0 configuration file # From d3beef080c6b897ce54bdd4542ca4d96ea7582a8 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 02:17:21 -0300 Subject: [PATCH 43/92] Config: apt dependencies --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 141514c5e..3f8418ea9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,6 +71,7 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib - run: pwd - run: ls -R - run: which meteor || curl https://install.meteor.com | /bin/sh @@ -90,6 +91,7 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib - run: which meteor || curl https://install.meteor.com | /bin/sh - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux From a86330a5d0d7885906a6617c5daa7ebb491039da Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 14:46:50 -0300 Subject: [PATCH 44/92] Config: several setup changes --- .circleci/config.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f8418ea9..c866b4614 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,14 +1,14 @@ # -# TODO: persist and recover from workspace -# TODO: fix `xvfb gulp test` command -# TODO: group into `dependencies`, `build` and `test` keys -# TODO: name commands properly +# OK persist and recover from workspace +# TODO: compilation # TODO: store_artifacts -# TODO: store_test_results -# TODO: one docker image per arch -# TODO: improve caching +# TODO: name commands properly # TODO: mac job +# TODO: improve caching +# TODO: fix `xvfb gulp test` command # TODO: windows job +# TODO: store_test_results +# TODO: one docker image per arch # defaults: &defaults @@ -16,6 +16,8 @@ defaults: &defaults docker: - image: circleci/node:8.9.4 environment: + # Setting variable to fix node-gyp build error: + # https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - CXX_host: 'g++ -m32' # Javascript Node CircleCI 2.0 configuration file @@ -38,21 +40,21 @@ jobs: # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - # Setting variable to fix node-gyp build error: https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - run: echo $CXX_host # Video config for testing # - run: export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start - # Installing multilib (build for 32 and 64 architectures): https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib + # Installing multilib (build for 32 and 64 architectures): + # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: which meteor || curl https://install.meteor.com | /bin/sh # Adding global dependencies - - run: yarn global add gulp-cli meteor-build-client electron@1.8.3 + - run: yarn global add gulp-cli meteor-build-client electron@1.8.4 - run: yarn @@ -71,7 +73,7 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils - run: pwd - run: ls -R - run: which meteor || curl https://install.meteor.com | /bin/sh @@ -91,7 +93,7 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils - run: which meteor || curl https://install.meteor.com | /bin/sh - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux From 64e70a6e145218f87c58e9b482a13e92f2dcddbe Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 4 Jul 2018 15:05:38 -0300 Subject: [PATCH 45/92] Config: using different docker image --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c866b4614..088f75751 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ defaults: &defaults working_directory: /home/circleci/mist docker: - - image: circleci/node:8.9.4 + - image: circleci/node:8.9.4-browsers environment: # Setting variable to fix node-gyp build error: # https://github.com/nodejs/node/issues/7173#issuecomment-224772258 @@ -48,7 +48,8 @@ jobs: # Installing multilib (build for 32 and 64 architectures): # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils + - run: sudo apt-get install graphicsmagick # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - run: which meteor || curl https://install.meteor.com | /bin/sh @@ -73,7 +74,8 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils + - run: sudo apt-get install graphicsmagick - run: pwd - run: ls -R - run: which meteor || curl https://install.meteor.com | /bin/sh @@ -93,7 +95,8 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils graphicsmagick xz-utils + - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils + - run: sudo apt-get install graphicsmagick - run: which meteor || curl https://install.meteor.com | /bin/sh - run: sudo yarn global add meteor-build-client electron@1.8.4 - run: yarn run gulp --wallet --linux From 996227c4f27fb08e254ab6564c8c757c39771b36 Mon Sep 17 00:00:00 2001 From: Ev Date: Thu, 5 Jul 2018 17:37:57 -0300 Subject: [PATCH 46/92] Removing RC information --- README.md | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/README.md b/README.md index 0de4a7da5..7ea613c0a 100644 --- a/README.md +++ b/README.md @@ -12,32 +12,6 @@ For the Mist API see [MISTAPI.md](MISTAPI.md). This repository is the Electron host for the [Meteor-based wallet dapp](https://github.com/ethereum/meteor-dapp-wallet). -## Release candidate 0.11.0 up for testing - -Feedback thread for 0.11.0-rc https://github.com/ethereum/mist/issues/3979 - -Reddit post: https://www.reddit.com/r/ethereum/comments/8uelv6/mist_browser_beta_and_ethereum_wallet_0110_preview/ - -File | Checksum (SHA256) --- | -- -[Ethereum-Wallet-installer-0-11-0-rc.exe](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-installer-0-11-0-rc.exe) | `f5431a32a419fdd51a379a02806a0d1cf9fa6a80213661aba2e4713731010615` -[Ethereum-Wallet-linux32-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux32-0-11-0-rc.deb) | `161f69d2546999363c64b1c85f938469a37afc51719ed48d4f4b02f33fd0206e` -[Ethereum-Wallet-linux32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux32-0-11-0-rc.zip) | `9da6da638b3cb851df78fbe5bf65229147e5a43555463da65ef3a31f7cf93034` -[Ethereum-Wallet-linux64-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux64-0-11-0-rc.deb) | `dd32ee3c36e4dc2ef04a118b4a6a3402097d722947b09fac9f8914672df39642` -[Ethereum-Wallet-linux64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux64-0-11-0-rc.zip) | `e515eb3ae7db6c9eee89892ed3fafa221bc8a0caad5c76305e08ffd950b31764` -[Ethereum-Wallet-macosx-0-11-0-rc.dmg](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-macosx-0-11-0-rc.dmg) | `408f50aca5049aeace30ca2d6357d8dd11868ab2ab9828d4ee7286b9eeff1081` -[Ethereum-Wallet-win32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-win32-0-11-0-rc.zip) | `c605ed12070d185d387f6d649e35659d003a029ad2a7c0c5e9903b488ec1e676` -[Ethereum-Wallet-win64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-win64-0-11-0-rc.zip) | `199af74e86c627fd0bc09027c01725869c0beb1eb4d85bfc7d9b9a3979a17b07` -[Mist-installer-0-11-0-rc.exe](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-installer-0-11-0-rc.exe) | `e11569e77abbc7555cd570d427c007ce6ab35fcdf299d4094fab55de10a6f101` -[Mist-linux32-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux32-0-11-0-rc.deb) | `29045433ac1020447e1977949deee05ae8eaef7c157ec6d7766d4eefccb48b9c` -[Mist-linux32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux32-0-11-0-rc.zip) | `9efccc68184eaa250a5dcce8515ffca59c6ce092913ac0ca7c8bb3a9c7db164c` -[Mist-linux64-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux64-0-11-0-rc.deb) | `e29bc4de4c3090b07130b3d96b9b5aae7c216fb6d51900330440535ece7681b5` -[Mist-linux64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux64-0-11-0-rc.zip) | `9137183d774ba57d071d3d0b9dcd566d878ace10b745c5b689c3fa2a0997f457` -[Mist-macosx-0-11-0-rc.dmg](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-macosx-0-11-0-rc.dmg) | `7f8ce72b9693f03a47674ea616ae9e22f67582d27c1265fbc4746d9584a7eab8` -[Mist-win32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-win32-0-11-0-rc.zip) | `f208bb6e00fc0f69ad36a028dc4278507fc5810def2415268b1a302e4e433a79` -[Mist-win64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-win64-0-11-0-rc.zip) | `632a1aaa24cfd92507be05b443ed4c4a2b8f618d4deb6324824d6cf06cdd50d9` - - ## Help and troubleshooting From 71e9b59bc5b5ced71d108f901282764b9c6ba8f9 Mon Sep 17 00:00:00 2001 From: Ev Date: Mon, 9 Jul 2018 21:36:35 -0300 Subject: [PATCH 47/92] Probot config --- .github/triage.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/triage.yml b/.github/triage.yml index 1012c9306..e580ae94a 100644 --- a/.github/triage.yml +++ b/.github/triage.yml @@ -1,2 +1 @@ -initLabels: - - "Status: Triage" +label: "Status: Triage" From 0a7ec896ebfa32d16563ca9c995433b90f5e3cc5 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 9 Jul 2018 22:50:47 -0300 Subject: [PATCH 48/92] Config: trying to circumvent graphicsmagick install error --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088f75751..7bf306a10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ # TODO: fix `xvfb gulp test` command # TODO: windows job # TODO: store_test_results -# TODO: one docker image per arch +# TODO: docker images # defaults: &defaults @@ -48,6 +48,7 @@ jobs: # Installing multilib (build for 32 and 64 architectures): # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h + - run: sudo apt-get update - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils - run: sudo apt-get install graphicsmagick @@ -74,6 +75,7 @@ jobs: - attach_workspace: at: /home/circleci/ - run: echo $CXX_host + - run: sudo apt-get update - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils - run: sudo apt-get install graphicsmagick - run: pwd From c69ed46a688dabad6f103c35592fefbef131c2e5 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 9 Jul 2018 23:54:52 -0300 Subject: [PATCH 49/92] Config: Extract installation commands to YAML variables; Building Mist and Wallet for linux --- .circleci/config.yml | 123 +++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 82 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bf306a10..8c65123db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,4 @@ # -# OK persist and recover from workspace # TODO: compilation # TODO: store_artifacts # TODO: name commands properly @@ -20,6 +19,24 @@ defaults: &defaults # https://github.com/nodejs/node/issues/7173#issuecomment-224772258 - CXX_host: 'g++ -m32' +linux_dependencies: &linux_dependencies + name: Linux package dependencies + # Installing multilib (build for 32 and 64 architectures): + # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h + command: | + sudo apt-get update && + sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils && + sudo apt-get install graphicsmagick + +install_meteor: &install_meteor + name: Installing Meteor + # PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + command: which meteor || curl https://install.meteor.com | /bin/sh + +install_node_modules: &install_node_modules + name: Installing node modules using yarn + command: yarn global add gulp-cli meteor-build-client && yarn + # Javascript Node CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-javascript/ for more details @@ -41,24 +58,9 @@ jobs: # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - - run: echo $CXX_host - - # Video config for testing - # - run: export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start - - # Installing multilib (build for 32 and 64 architectures): - # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h - - run: sudo apt-get update - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils - - run: sudo apt-get install graphicsmagick - - # - run: PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - run: which meteor || curl https://install.meteor.com | /bin/sh - - # Adding global dependencies - - run: yarn global add gulp-cli meteor-build-client electron@1.8.4 - - - run: yarn + - run: <<: *linux_dependencies + - run: << *install_meteor + - run: << *install_node_modules - save_cache: paths: @@ -69,42 +71,43 @@ jobs: paths: - mist - build-mist: + build-mist-linux: <<: *defaults steps: - attach_workspace: at: /home/circleci/ - - run: echo $CXX_host - - run: sudo apt-get update - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils - - run: sudo apt-get install graphicsmagick - - run: pwd - - run: ls -R - - run: which meteor || curl https://install.meteor.com | /bin/sh - - run: sudo yarn global add meteor-build-client + + - run: <<: *linux_dependencies + - run: << *install_meteor + - run: << *install_node_modules + - run: yarn run gulp --linux - run: yarn run gulp verify-artifacts --mist --linux + - store_artifacts: path: dist_mist/release + - persist_to_workspace: root: /home/circleci/ paths: - mist/dist_mist - build-wallet: + build-wallet-linux: <<: *defaults steps: - attach_workspace: at: /home/circleci/ - - run: echo $CXX_host - - run: sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils - - run: sudo apt-get install graphicsmagick - - run: which meteor || curl https://install.meteor.com | /bin/sh - - run: sudo yarn global add meteor-build-client electron@1.8.4 + + - run: <<: *linux_dependencies + - run: << *install_meteor + - run: << *install_node_modules + - run: yarn run gulp --wallet --linux - run: yarn run gulp verify-artifacts --wallet --linux + - store_artifacts: - path: dist_mist/release + path: dist_wallet/release + - persist_to_workspace: root: /home/circleci/ paths: @@ -123,64 +126,20 @@ jobs: steps: - attach_workspace: at: /home/circleci/ + - run: << *install_node_modules - run: yarn test:unit:once - github-release: - <<: *defaults - steps: - - attach_workspace: - at: /home/circleci/ - - run: gulp upload-queue --linux - - run: gulp upload-queue --wallet --linux - - workspace-save: - docker: - - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist - steps: - - run: mkdir dist_files - - run: echo "debug info" >> dist_files/file.txt - - run: echo "src files" >> index.js - - run: pwd - - run: ls -lR - - persist_to_workspace: - root: /home/circleci/ - paths: mist - - workspace-attach: - docker: - - image: circleci/node:8.9.4 - working_directory: /home/circleci/mist - steps: - - attach_workspace: - at: /home/circleci/ - - run: pwd - - run: ls -R - - workflows: version: 2 build_and_test: jobs: - build - - build-mist: + - build-mist-linux: requires: - build - - build-wallet: + - build-wallet-linux: requires: - build - - spectron-test: - requires: - - build-mist - unit-test: requires: - build - - github-release: - requires: - - spectron-test - - unit-test - - build-wallet - - workspace-save - - workspace-attach: - requires: - - workspace-save From d6de97ec9b66d44ae573e3cadf6ff41349d98691 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 00:07:05 -0300 Subject: [PATCH 50/92] Config: Fixing syntax --- .circleci/config.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c65123db..d7ae5e8be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,9 +58,12 @@ jobs: # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - - run: <<: *linux_dependencies - - run: << *install_meteor - - run: << *install_node_modules + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules - save_cache: paths: @@ -77,9 +80,12 @@ jobs: - attach_workspace: at: /home/circleci/ - - run: <<: *linux_dependencies - - run: << *install_meteor - - run: << *install_node_modules + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules - run: yarn run gulp --linux - run: yarn run gulp verify-artifacts --mist --linux @@ -98,9 +104,12 @@ jobs: - attach_workspace: at: /home/circleci/ - - run: <<: *linux_dependencies - - run: << *install_meteor - - run: << *install_node_modules + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules - run: yarn run gulp --wallet --linux - run: yarn run gulp verify-artifacts --wallet --linux From 633eea1159c55f76b93b37dae8c7e234687387c8 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 00:14:01 -0300 Subject: [PATCH 51/92] Config: Fixing syntax --- .circleci/config.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7ae5e8be..097b9fb9c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,7 @@ install_node_modules: &install_node_modules name: Installing node modules using yarn command: yarn global add gulp-cli meteor-build-client && yarn + # Javascript Node CircleCI 2.0 configuration file # # Check https://circleci.com/docs/2.0/language-javascript/ for more details @@ -58,12 +59,12 @@ jobs: # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV - - run: - <<: *linux_dependencies - run: - <<: *install_meteor + <<: *linux_dependencies + - run: + <<: *install_meteor - run: - <<: *install_node_modules + <<: *install_node_modules - save_cache: paths: @@ -81,11 +82,11 @@ jobs: at: /home/circleci/ - run: - <<: *linux_dependencies + <<: *linux_dependencies - run: - <<: *install_meteor + <<: *install_meteor - run: - <<: *install_node_modules + <<: *install_node_modules - run: yarn run gulp --linux - run: yarn run gulp verify-artifacts --mist --linux @@ -105,11 +106,11 @@ jobs: at: /home/circleci/ - run: - <<: *linux_dependencies + <<: *linux_dependencies - run: - <<: *install_meteor + <<: *install_meteor - run: - <<: *install_node_modules + <<: *install_node_modules - run: yarn run gulp --wallet --linux - run: yarn run gulp verify-artifacts --wallet --linux From 49fa2bdf8af61e58f2891a52d0ec3029d21a5892 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 00:35:46 -0300 Subject: [PATCH 52/92] Config: saving time, removing persist_to_workspace from jobs at the end of workflow --- .circleci/config.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 097b9fb9c..3e185eb89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ jobs: paths: - mist - build-mist-linux: + mist-linux: <<: *defaults steps: - attach_workspace: @@ -94,12 +94,7 @@ jobs: - store_artifacts: path: dist_mist/release - - persist_to_workspace: - root: /home/circleci/ - paths: - - mist/dist_mist - - build-wallet-linux: + wallet-linux: <<: *defaults steps: - attach_workspace: @@ -118,11 +113,6 @@ jobs: - store_artifacts: path: dist_wallet/release - - persist_to_workspace: - root: /home/circleci/ - paths: - - mist/dist_wallet - spectron-test: docker: - image: circleci/node:8.9.4 @@ -144,10 +134,10 @@ workflows: build_and_test: jobs: - build - - build-mist-linux: + - mist-linux: requires: - build - - build-wallet-linux: + - wallet-linux: requires: - build - unit-test: From aaa081e11656eab740fc1ed12d408e2dabbe22af Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 00:51:30 -0300 Subject: [PATCH 53/92] Config: building for windows --- .circleci/config.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e185eb89..6da2a7285 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,6 +113,44 @@ jobs: - store_artifacts: path: dist_wallet/release + mist-windows: + <<: *defaults + steps: + - attach_workspace: + at: /home/circleci/ + + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules + + - run: yarn run gulp --windows + - run: yarn run gulp verify-artifacts --mist --windows + + - store_artifacts: + path: dist_mist/release + + wallet-windows: + <<: *defaults + steps: + - attach_workspace: + at: /home/circleci/ + + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules + + - run: yarn run gulp --wallet --windows + - run: yarn run gulp verify-artifacts --wallet --windows + + - store_artifacts: + path: dist_wallet/release + spectron-test: docker: - image: circleci/node:8.9.4 @@ -140,6 +178,12 @@ workflows: - wallet-linux: requires: - build + - mist-windows: + requires: + - build + - wallet-windows: + requires: + - build - unit-test: requires: - build From 82b7a879f73716ce4c97942a362e75a9c82faa16 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 01:16:03 -0300 Subject: [PATCH 54/92] Config: building for windows --- .circleci/config.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6da2a7285..1617772ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,13 @@ linux_dependencies: &linux_dependencies sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils && sudo apt-get install graphicsmagick +windows_dependencies: &windows_dependencies + name: Windows package dependencies + command: | + sudo add-apt-repository ppa:ubuntu-wine/ppa -y && + sudo apt-get update && + sudo apt-get install -no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 + install_meteor: &install_meteor name: Installing Meteor # PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh @@ -102,6 +109,8 @@ jobs: - run: <<: *linux_dependencies + - run: + <<: *windows_dependencies - run: <<: *install_meteor - run: @@ -121,6 +130,8 @@ jobs: - run: <<: *linux_dependencies + - run: + <<: *windows_dependencies - run: <<: *install_meteor - run: From 950effc8c93d4f3b829be9426dbcaf7e971a3165 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 01:43:19 -0300 Subject: [PATCH 55/92] Config: building for windows --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1617772ad..921c1f670 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,8 +31,6 @@ linux_dependencies: &linux_dependencies windows_dependencies: &windows_dependencies name: Windows package dependencies command: | - sudo add-apt-repository ppa:ubuntu-wine/ppa -y && - sudo apt-get update && sudo apt-get install -no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 install_meteor: &install_meteor @@ -109,8 +107,6 @@ jobs: - run: <<: *linux_dependencies - - run: - <<: *windows_dependencies - run: <<: *install_meteor - run: @@ -151,6 +147,8 @@ jobs: - run: <<: *linux_dependencies + - run: + <<: *windows_dependencies - run: <<: *install_meteor - run: From 570fe03ac6df985fef8096787f851bb046aa8a63 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 02:34:20 -0300 Subject: [PATCH 56/92] Config: building for windows --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 921c1f670..3b9916821 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ linux_dependencies: &linux_dependencies windows_dependencies: &windows_dependencies name: Windows package dependencies command: | - sudo apt-get install -no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 + sudo apt-get install --no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 install_meteor: &install_meteor name: Installing Meteor @@ -133,8 +133,8 @@ jobs: - run: <<: *install_node_modules - - run: yarn run gulp --windows - - run: yarn run gulp verify-artifacts --mist --windows + - run: yarn run gulp --win + - run: yarn run gulp verify-artifacts --mist --win - store_artifacts: path: dist_mist/release @@ -154,8 +154,8 @@ jobs: - run: <<: *install_node_modules - - run: yarn run gulp --wallet --windows - - run: yarn run gulp verify-artifacts --wallet --windows + - run: yarn run gulp --wallet --win + - run: yarn run gulp verify-artifacts --wallet --win - store_artifacts: path: dist_wallet/release From 4b163169a3234149610269ccbddfd3e2b20cc683 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 10 Jul 2018 09:56:06 -0300 Subject: [PATCH 57/92] Config: Disabling windows build for this PR --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b9916821..d8a38a46b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,6 +31,9 @@ linux_dependencies: &linux_dependencies windows_dependencies: &windows_dependencies name: Windows package dependencies command: | + sudo apt-get install software-properties-common && + sudo dpkg --add-architecture i386 && + sudo add-apt-repository ppa:ubuntu-wine/ppa -y && sudo apt-get install --no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 install_meteor: &install_meteor @@ -187,12 +190,6 @@ workflows: - wallet-linux: requires: - build - - mist-windows: - requires: - - build - - wallet-windows: - requires: - - build - unit-test: requires: - build From e510d62b2eeb6f9322b11be7a126cc4a292b972b Mon Sep 17 00:00:00 2001 From: Ev Date: Tue, 10 Jul 2018 11:04:33 -0300 Subject: [PATCH 58/92] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b5594a79f..fd2768f24 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Mist Browserbeta -[![Github All Releases](https://img.shields.io/github/downloads/ethereum/mist/total.svg)]() +[![Github All Releases](https://img.shields.io/github/downloads/ethereum/mist/total.svg)](http://www.somsubhra.com/github-release-stats/?username=ethereum&repository=mist) [![Build Status develop branch](https://travis-ci.org/ethereum/mist.svg?branch=develop)](https://travis-ci.org/ethereum/mist) +[![CircleCI](https://circleci.com/gh/ethereum/mist/tree/develop.svg?style=svg)](https://circleci.com/gh/ethereum/mist/tree/develop) [![Greenkeeper badge](https://badges.greenkeeper.io/ethereum/mist.svg)](https://greenkeeper.io/) [![Join the chat at https://gitter.im/ethereum/mist](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/mist) [![Code Triagers Badge](https://www.codetriage.com/ethereum/mist/badges/users.svg)](https://www.codetriage.com/ethereum/mist) @@ -10,7 +11,7 @@ The Mist browser is the tool of choice to browse and use Ðapps. For the Mist API see [MISTAPI.md](MISTAPI.md). -This repository is the Electron host for the [Meteor-based wallet dapp](https://github.com/ethereum/meteor-dapp-wallet). +This repository is also the Electron host for the [Meteor-based wallet dapp](https://github.com/ethereum/meteor-dapp-wallet). ## Help and troubleshooting @@ -208,13 +209,13 @@ To generate the binaries for Mist run: $ gulp ``` -To generate the Ethereum Wallet (this will pack the one Ðapp from https://github.com/ethereum/meteor-dapp-wallet): +To generate the Ethereum Wallet: ```bash $ gulp --wallet ``` -The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. +The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. From 0.11.0, both Ethereum Wallet and Mist bundle a meteor-dapp-wallet instance (https://github.com/ethereum/meteor-dapp-wallet). #### Options From 07c2e3909f1fd34b6f294301ac615a0435fd4ffb Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 12 Jul 2018 15:49:59 -0300 Subject: [PATCH 59/92] Debugging artifacts on windows --- .travis.yml | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64fe4c200..48ef52231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,8 @@ script: - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi after_success: - - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi + #- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi + - gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM notifications: diff --git a/package.json b/package.json index dee2c627d..62338ae10 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Mist", - "version": "0.11.0", + "version": "0.12.0", "license": "GPL-3.0", "author": "Ethereum Mist Team ", "repository": { From 264de7b1d624cf7f09f023dbf76af7370ab1ab5b Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 09:25:10 -0300 Subject: [PATCH 60/92] Allows builds for every branch; Testing artifact upload --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48ef52231..24e6a975d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,9 @@ cache: sudo: required -branches: - only: - - develop - - master - - /^greenkeeper/.*$/ +addons: + artifacts: + debug: true matrix: include: From 23afd2ea6565736957662c282d703a2a13143550 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 10:53:04 -0300 Subject: [PATCH 61/92] Testing artifact upload --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 24e6a975d..8c7f73ef0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ sudo: required addons: artifacts: debug: true + paths: + - dist_mist/release/* + - dist_wallet/release/* matrix: include: From a8cb1705916ea70e06eac5ad3f760d2193b123b0 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 11:36:00 -0300 Subject: [PATCH 62/92] Docker image to build windows and linux --- .travis.yml | 132 ++++++++++++--------------------------------------- package.json | 3 +- 2 files changed, 32 insertions(+), 103 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c7f73ef0..72b729dee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,114 +1,42 @@ -language: node_js -node_js: '8' -cache: - yarn: true - directories: - - node_modules - - 'interface/.meteor' - -sudo: required - -addons: - artifacts: - debug: true - paths: - - dist_mist/release/* - - dist_wallet/release/* - matrix: include: - # WINDOWS cross-built from linux - - os: linux - dist: trusty - env: - - GULP_PLATFORM=win - addons: - apt: - packages: - - icnsutils - - graphicsmagick - - xz-utils - - nsis - - g++-multilib - sources: - - mono - before_install: - - sudo dpkg --add-architecture i386 && sudo add-apt-repository ppa:ubuntu-wine/ppa -y - - sudo apt-get update -q - - sudo apt-get install --no-install-recommends -y mono-devel ca-certificates-mono wine1.8 - - # LINUX - - os: linux - dist: trusty - env: - - GULP_PLATFORM=linux - addons: - apt: - packages: - - icnsutils - - graphicsmagick - - xz-utils - - gcc-multilib - - g++-multilib - - # MAC - os: osx - osx_image: xcode8.3 # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060) + osx_image: xcode9.4 + language: node_js + node_js: "10" env: - - GULP_PLATFORM=mac - before_install: - - npm install -g yarn # macOS xcode8 image doesn't natively support yarn yet - - allow_failures: - - os: osx + - ELECTRON_CACHE=$HOME/.cache/electron + - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - fast_finish: true + - os: linux + services: docker + language: generic +addons: + artifacts: true -install: - - echo $PATH - - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - export PATH=$PATH:`yarn global bin` - - yarn global add gulp-cli meteor-build-client electron@1.8.4 - - yarn +cache: + directories: + - node_modules + - 'interface/.meteor' + # - $HOME/.cache/electron + #- $HOME/.cache/electron-builder script: - # disable macOS code-signing (production certificate) on develop branch - - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi - # windows code-signing on master branch - - if [[ $GULP_PLATFORM == "win" && $TRAVIS_BRANCH == "master" ]]; then export CSC_LINK=$CSC_WIN_LINK && CSC_KEY_PASSWORD=$CSC_WIN_KEY_PASSWORD; fi - - # unit test - - if [[ $GULP_PLATFORM == "linux" ]]; then yarn test:unit:once; fi - - # build mist - - if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds - - if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi - - # assert creation of Mist artifacts - - gulp verify-artifacts --mist --$GULP_PLATFORM - - # build wallet if on master branch - - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi - - # assert creation of Wallet artifacts - - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp verify-artifacts --wallet --$GULP_PLATFORM; fi - - # prepare integration tests - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi - - # currently, tests should run in linux and mac - - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi + - | + if [ "$TRAVIS_OS_NAME" == "linux" ]; then + docker run --rm \ + --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ + -v ${PWD}:/project \ + -v ~/.cache/electron:/root/.cache/electron \ + -v ~/.cache/electron-builder:/root/.cache/electron-builder \ + electronuserland/builder:wine \ + /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn release --linux --win" + else + yarn release + fi +before_cache: + - rm -rf $HOME/.cache/electron-builder/wine -after_success: - #- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi - - gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/33972d9e627a142c57a6 - on_success: change - on_failure: always - on_start: never diff --git a/package.json b/package.json index 62338ae10..65a15e781 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "dev:rebuild": "./node_modules/.bin/electron-rebuild", "test:basic": "gulp test --test=basic", "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", - "test:unit:once": "mocha --compilers babel-register tests/unit/**/*" + "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", + "release": "gulp" }, "main": "main.js", "dependencies": { From 0404a4bb66aa41bbc60b58582ed2acfe8d2ca103 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 11:46:51 -0300 Subject: [PATCH 63/92] Installing meteor --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72b729dee..6b1c04b7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ matrix: - os: linux services: docker language: generic - addons: artifacts: true @@ -23,6 +22,9 @@ cache: #- $HOME/.cache/electron-builder script: + - curl https://install.meteor.com | /bin/sh + - yarn global add gulp-cli meteor-build-client electron@1.8.4 + - | if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run --rm \ From b5fc071b4313a4f00f040e7fb70fd98045a11aa6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 11:56:23 -0300 Subject: [PATCH 64/92] Meteor on path --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6b1c04b7d..a23517b90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ cache: script: - curl https://install.meteor.com | /bin/sh + - PATH=$PATH:$HOME/.meteor - yarn global add gulp-cli meteor-build-client electron@1.8.4 - | From 00a3cc97a4bcf205d207faf807603cbbc99816c1 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 14:00:54 -0300 Subject: [PATCH 65/92] Meteor config; using git submodule for wallet --- .gitmodules | 6 ++++++ .travis.yml | 3 ++- gulpTasks/building.js | 28 +++++----------------------- meteor-dapp-wallet | 1 + package.json | 3 ++- 5 files changed, 16 insertions(+), 25 deletions(-) create mode 160000 meteor-dapp-wallet diff --git a/.gitmodules b/.gitmodules index eaad99e7a..a2c7f172a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "dapp-styles"] path = interface/public/dapp-styles url = git://github.com/ethereum/dapp-styles.git +[submodule "wallet"] + path = wallet + url = https://github.com/ethereum/meteor-dapp-wallet.git +[submodule "meteor-dapp-wallet"] + path = meteor-dapp-wallet + url = https://github.com/ethereum/meteor-dapp-wallet.git diff --git a/.travis.yml b/.travis.yml index a23517b90..38e74c704 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,9 @@ cache: #- $HOME/.cache/electron-builder script: - - curl https://install.meteor.com | /bin/sh - PATH=$PATH:$HOME/.meteor + - curl https://install.meteor.com | /bin/sh + - yarn global add gulp-cli meteor-build-client electron@1.8.4 - | diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 3fe70d979..e52676c2d 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -76,16 +76,14 @@ gulp.task('switch-production', cb => { gulp.task('pack-wallet', cb => { if (options.type == 'mist') { - del(['./wallet', './meteor-dapp-wallet']).then(() => { + del(['./wallet']).then(() => { console.log('Building wallet...'); exec( - `git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git \ - && cd meteor-dapp-wallet/app \ + `cd meteor-dapp-wallet/app \ && yarn install \ && ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, (err, stdout, stderr) => { console.log(stdout, stderr); - del(['./meteor-dapp-wallet']); cb(err); } ); @@ -110,25 +108,9 @@ gulp.task('bundling-interface', cb => { }; if (type === 'wallet') { - if (options.walletSource === 'local') { - console.log('Use local wallet at ../meteor-dapp-wallet/app'); - bundle(`&& cd ../../meteor-dapp-wallet/app \ - && yarn \ - && ../../../node_modules/.bin/meteor-build-client ../../mist/dist_${type}/app/interface/wallet -p ""`); - } else { - console.log( - `Pulling https://github.com/ethereum/meteor-dapp-wallet/tree/${ - options.walletSource - } "${options.walletSource}" branch...` - ); - bundle(`&& cd ../dist_${type} \ - && git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git \ - && cd meteor-dapp-wallet/app \ - && yarn \ - && ../../../node_modules/.bin/meteor-build-client ../../app/interface/wallet -p "" \ - && cd ../../ \ - && rm -rf meteor-dapp-wallet`); - } + bundle(`&& cd ../meteor-dapp-wallet/app \ + && yarn install \ + && ../../node_modules/.bin/meteor-build-client ../dist_${type}/app/interface/wallet -p ""`); } else { bundle(); } diff --git a/meteor-dapp-wallet b/meteor-dapp-wallet new file mode 160000 index 000000000..6a6463b1a --- /dev/null +++ b/meteor-dapp-wallet @@ -0,0 +1 @@ +Subproject commit 6a6463b1a6aa615e4364592c12c933ee816fb28b diff --git a/package.json b/package.json index 65a15e781..55abce39b 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,14 @@ "version": "0.12.0", "license": "GPL-3.0", "author": "Ethereum Mist Team ", + "description": "Ethereum Mist", "repository": { "type": "git", "url": "https://github.com/ethereum/mist.git" }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; (cd interface && yarn); yarn dev:rebuild; gulp pack-wallet", + "postinstall": "electron-builder install-app-deps; (cd interface && yarn); yarn dev:rebuild; git submodule update --recursive; gulp pack-wallet; which meteor || curl https://install.meteor.com | /bin/sh", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", From d75c7ec96b13f94b71494341d505653bcf831e1b Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 14:09:33 -0300 Subject: [PATCH 66/92] Installing meteor on Docker container --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38e74c704..d43df1f33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,8 @@ cache: #- $HOME/.cache/electron-builder script: - - PATH=$PATH:$HOME/.meteor - - curl https://install.meteor.com | /bin/sh - - yarn global add gulp-cli meteor-build-client electron@1.8.4 + - yarn global add gulp-cli meteor-build-client - | if [ "$TRAVIS_OS_NAME" == "linux" ]; then @@ -35,12 +33,10 @@ script: -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn release --linux --win" + /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn release --linux --win" else yarn release fi before_cache: - rm -rf $HOME/.cache/electron-builder/wine - - From 119a5ce953115c45aa943115ad0bc18a6cc0384d Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 14:31:07 -0300 Subject: [PATCH 67/92] - Do not delete wallet repo on clean_dist task - improve postinstall hook - using `yarn gulp` to execute the build pipeline --- .travis.yml | 2 +- gulpTasks/building.js | 2 +- package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d43df1f33..4e553e8ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ script: -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn release --linux --win" + /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn gulp --win" else yarn release fi diff --git a/gulpTasks/building.js b/gulpTasks/building.js index e52676c2d..4aa7e7566 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -15,7 +15,7 @@ const type = options.type; const applicationName = options.wallet ? 'Ethereum Wallet' : 'Mist'; gulp.task('clean-dist', cb => { - return del([`./dist_${type}`, './meteor-dapp-wallet'], cb); + return del([`./dist_${type}`], cb); }); gulp.task('copy-app-source-files', () => { diff --git a/package.json b/package.json index 55abce39b..f2bdc1303 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; (cd interface && yarn); yarn dev:rebuild; git submodule update --recursive; gulp pack-wallet; which meteor || curl https://install.meteor.com | /bin/sh", + "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; gulp pack-wallet; echo METEOR && which meteor || curl https://install.meteor.com | /bin/sh; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", @@ -18,7 +18,7 @@ "test:basic": "gulp test --test=basic", "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", - "release": "gulp" + "gulp": "gulp" }, "main": "main.js", "dependencies": { From 4130fd5ea70cf27992edbeed278edf9032b1f24f Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 14:56:53 -0300 Subject: [PATCH 68/92] Meteor config --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e553e8ef..cbabbe44b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ matrix: - os: linux services: docker language: generic + env: + - METEOR_ALLOW_SUPERUSER=1 addons: artifacts: true @@ -35,7 +37,7 @@ script: electronuserland/builder:wine \ /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn gulp --win" else - yarn release + yarn gulp fi before_cache: - rm -rf $HOME/.cache/electron-builder/wine From c2f51b4872d2d2332de073aa4cd594301ca5b08e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 15:28:32 -0300 Subject: [PATCH 69/92] Version-locking meteor --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2bdc1303..90a1f9d5d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; gulp pack-wallet; echo METEOR && which meteor || curl https://install.meteor.com | /bin/sh; (cd interface && yarn)", + "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; gulp pack-wallet; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", From e2f8013fca305e89630962af31f849ba659e2874 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 15:47:25 -0300 Subject: [PATCH 70/92] Meteor user permission for builds --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbabbe44b..a7f11de83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: services: docker language: generic env: - - METEOR_ALLOW_SUPERUSER=1 + - METEOR_UNSAFE_PERM=1 addons: artifacts: true @@ -30,7 +30,7 @@ script: - | if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run --rm \ - --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ + --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_|METEOR_') \ -v ${PWD}:/project \ -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ From ae33e59d0542bcff1f425f9a7cce1bf32660b162 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 15:50:34 -0300 Subject: [PATCH 71/92] - Gulp verify artifacts - Mac config --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7f11de83..c336a1933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,9 +35,10 @@ script: -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn gulp --win" + /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn gulp --win && yarn gulp verify-artifacts --win" else - yarn gulp + yarn gulp --mac + yarn gulp verify-artifacts --mac fi before_cache: - rm -rf $HOME/.cache/electron-builder/wine From 0b85e086ff0cfb1d9695ed8ae24af61f337f399e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 15:52:51 -0300 Subject: [PATCH 72/92] Meteor config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c336a1933..8d7d7b0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ matrix: services: docker language: generic env: - - METEOR_UNSAFE_PERM=1 + - METEOR_UNSAFE_PERM=true + - METEOR_NO_RELEASE_CHECK=true addons: artifacts: true From 6a7b99a8f6ef24920231908ac2397ddab72b94cd Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 15:57:11 -0300 Subject: [PATCH 73/92] Fixing artifact upload path --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8d7d7b0e5..f55644665 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ matrix: - METEOR_NO_RELEASE_CHECK=true addons: artifacts: true + paths: + - $(ls dist_mist/release/* | tr "\n" ":") + - $(ls dist_wallet/release/* | tr "\n" ":") cache: directories: From 84968b41459cb2d38a5c7f9b19327793de66e6f6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Fri, 13 Jul 2018 21:30:31 -0300 Subject: [PATCH 74/92] Remove gulp pack-wallet from postinstall; proper version number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 90a1f9d5d..196ea5763 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Mist", - "version": "0.12.0", + "version": "0.11.1", "license": "GPL-3.0", "author": "Ethereum Mist Team ", "description": "Ethereum Mist", @@ -10,7 +10,7 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; gulp pack-wallet; (cd interface && yarn)", + "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", From 433cd5c9ec9c955fce5d05e98c197df7a7651ced Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:31:02 -0300 Subject: [PATCH 75/92] Build process changes --- gulpTasks/building.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 4aa7e7566..0f57fb1fd 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -32,9 +32,7 @@ gulp.task('copy-app-source-files', () => { 'wallet/**/*', '!node_modules/electron/', '!node_modules/electron/**/*', - '!./tests/wallet/*', - '!./tests/mist/*', - '!./tests/unit/*' + '!./tests/**/*' ], { base: './' @@ -130,10 +128,11 @@ gulp.task('build-dist', cb => { name: applicationName.replace(/\s/, ''), productName: applicationName, description: applicationName, + license: 'GPL-3.0', homepage: 'https://github.com/ethereum/mist', build: { appId: `org.ethereum.${type}`, - asar: true, + asar: false, directories: { buildResources: '../build', output: '../dist' From c223d44ac8056dd9b9a184bb68c1d75962496d79 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:31:41 -0300 Subject: [PATCH 76/92] Updating electron-builder; removing postinstall steps --- package.json | 7 +- yarn.lock | 416 ++++++++++++++++++--------------------------------- 2 files changed, 144 insertions(+), 279 deletions(-) diff --git a/package.json b/package.json index 196ea5763..96ed7c3dd 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,10 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; yarn dev:rebuild; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", + "postinstall": "electron-builder install-app-deps; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", - "dev:rebuild": "./node_modules/.bin/electron-rebuild", - "test:basic": "gulp test --test=basic", "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", "gulp": "gulp" @@ -36,7 +34,6 @@ "ethereumjs-abi": "^0.6.3", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.2", - "ethereumjs-wallet": "^0.6.0", "fs-promise": "^2.0.0", "got": "^7.1.0", "i18next": "^8.4.3", @@ -71,7 +68,7 @@ "del": "^3.0.0", "ecstatic": "^2.1.0", "electron": "1.8.4", - "electron-builder": "^20.8.1", + "electron-builder": "^20.17.2", "electron-rebuild": "^1.7.3", "eslint": "^4.19.1", "eslint-config-prettier": "^2.9.0", diff --git a/yarn.lock b/yarn.lock index 728e1b664..f364421db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,10 +39,6 @@ addressparser@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746" -aes-js@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d" - agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce" @@ -73,9 +69,9 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.4.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d" +ajv@^6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -167,17 +163,9 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@1.9.11: - version "1.9.11" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.11.tgz#bf04d4cdfc0a8ed83acedc5f9ab16be73b5a3a57" - -app-builder-bin@1.9.5: - version "1.9.5" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.5.tgz#f4e2b26e26578c9a48cea85da44f0bc1a7582fc0" - -app-builder-bin@1.9.7: - version "1.9.7" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.7.tgz#9f01439fa8088a43471df9e5e071dd3880a8cff0" +app-builder-bin@1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.11.1.tgz#33741167f2873cf76805c9557b62caac8ede017b" append-buffer@^1.0.2: version "1.0.2" @@ -780,10 +768,6 @@ base-64@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" -base-x@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac" - base64-js@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" @@ -1036,23 +1020,6 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -bs58@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d" - -bs58@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-3.1.0.tgz#d4c26388bf4804cac714141b1945aa47e5eb248e" - dependencies: - base-x "^1.1.0" - -bs58check@^1.0.8: - version "1.3.4" - resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-1.3.4.tgz#c52540073749117714fa042c3047eb8f9151cbf8" - dependencies: - bs58 "^3.1.0" - create-hash "^1.1.0" - buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" @@ -1121,71 +1088,33 @@ buffers@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" -builder-util-runtime@4.2.1, builder-util-runtime@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.1.tgz#0caa358f1331d70680010141ca591952b69b35bc" +builder-util-runtime@4.4.0, builder-util-runtime@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.4.0.tgz#1f486819df12a04abfa128fe082e7c54edda0ef7" dependencies: bluebird-lst "^1.0.5" debug "^3.1.0" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" sax "^1.2.4" -builder-util@5.11.1: - version "5.11.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.1.tgz#e1540935bc0efcb3948ae364a2f71e08d7bc82e0" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.5" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.0" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.2" - -builder-util@5.11.2: - version "5.11.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.2.tgz#2d4829f0743ce1b654e94586fade63fd6cfefae5" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.0" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.2" - -builder-util@^5.11.0, builder-util@^5.11.2: - version "5.11.4" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.4.tgz#24d72aa567ecfeacca72b0740b4ddbffaaef617c" +builder-util@5.16.0, builder-util@^5.14.0, builder-util@~5.16.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.16.0.tgz#8b9aabe15a1a5c4ffa8ebc511049248918f717df" dependencies: "7zip-bin" "~4.0.2" - app-builder-bin "1.9.11" + app-builder-bin "1.11.1" bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" + builder-util-runtime "^4.4.0" chalk "^2.4.1" debug "^3.1.0" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" is-ci "^1.1.0" - js-yaml "^3.11.0" + js-yaml "^3.12.0" lazy-val "^1.0.3" semver "^5.5.0" source-map-support "^0.5.6" stat-mode "^0.2.2" - temp-file "^3.1.2" + temp-file "^3.1.3" buildmail@4.0.1: version "4.0.1" @@ -1452,13 +1381,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -coinstring@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/coinstring/-/coinstring-2.3.0.tgz#cdb63363a961502404a25afb82c2e26d5ff627a4" - dependencies: - bs58 "^2.0.1" - create-hash "^1.1.1" - collection-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" @@ -1645,7 +1567,7 @@ create-error-class@^3.0.0: dependencies: capture-stack-trace "^1.0.0" -create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2: +create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" dependencies: @@ -1774,7 +1696,7 @@ debug@2.6.8: dependencies: ms "2.0.0" -debug@3.1.0, debug@^3.0.0, debug@^3.1.0, debug@~3.1.0: +debug@3.1.0, debug@^3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -1784,6 +1706,12 @@ decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +decamelize@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" + dependencies: + xregexp "4.0.0" + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -1988,16 +1916,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@4.10.1: - version "4.10.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.10.1.tgz#5603daa1f93e23b6b3572549f188a62e16eb1ffb" +dmg-builder@4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.14.0.tgz#6d19922a82cee78cc13557ab0cbc16047864002a" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.11.0" - electron-builder-lib "~20.14.6" - fs-extra-p "^4.6.0" + builder-util "~5.16.0" + electron-builder-lib "~20.20.4" + fs-extra-p "^4.6.1" iconv-lite "^0.4.23" - js-yaml "^3.11.0" + js-yaml "^3.12.0" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -2028,9 +1956,9 @@ dotenv-expand@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" -dotenv@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" +dotenv@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935" double-ended-queue@^2.1.0-0: version "2.1.0-0" @@ -2103,84 +2031,54 @@ ejs@~2.5.6: version "2.5.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5" -electron-builder-lib@20.15.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.15.1.tgz#d2675e71918f62561cf5ecae633dfe5f4219d0e3" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.5" - builder-util "5.11.2" - builder-util-runtime "4.2.1" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - ejs "^2.6.1" - electron-osx-sign "0.4.10" - electron-publish "20.15.0" - fs-extra-p "^4.6.0" - hosted-git-info "^2.6.0" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - minimatch "^3.0.4" - normalize-package-data "^2.4.0" - plist "^3.0.1" - read-config-file "3.0.1" - sanitize-filename "^1.6.1" - semver "^5.5.0" - stream-json "^0.6.1" - temp-file "^3.1.2" - -electron-builder-lib@~20.14.6: - version "20.14.7" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz#db91977dd13b0a288e1da5629183807a9847de21" +electron-builder-lib@20.20.4, electron-builder-lib@~20.20.4: + version "20.20.4" + resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.20.4.tgz#fd129ae85c5514f16f4f392218141ebe3dc8411d" dependencies: "7zip-bin" "~4.0.2" - app-builder-bin "1.9.5" + app-builder-bin "1.11.1" async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - builder-util "5.11.1" - builder-util-runtime "4.2.1" + builder-util "5.16.0" + builder-util-runtime "4.4.0" chromium-pickle-js "^0.2.0" debug "^3.1.0" ejs "^2.6.1" electron-osx-sign "0.4.10" - electron-publish "20.14.6" - fs-extra-p "^4.6.0" - hosted-git-info "^2.6.0" + electron-publish "20.22.0" + env-paths "^1.0.0" + fs-extra-p "^4.6.1" + hosted-git-info "^2.7.1" is-ci "^1.1.0" isbinaryfile "^3.0.2" - js-yaml "^3.11.0" + js-yaml "^3.12.0" lazy-val "^1.0.3" minimatch "^3.0.4" normalize-package-data "^2.4.0" plist "^3.0.1" - read-config-file "3.0.1" + read-config-file "3.1.0" sanitize-filename "^1.6.1" semver "^5.5.0" - stream-json "^0.6.1" - temp-file "^3.1.2" + sumchecker "^2.0.2" + temp-file "^3.1.3" -electron-builder@^20.8.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.15.1.tgz#078cda29bdb7240244e9bccf30740b1ea42deb44" +electron-builder@^20.17.2: + version "20.20.4" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.20.4.tgz#09d879c6551df801444a153dc7b159a304e1d55d" dependencies: bluebird-lst "^1.0.5" - builder-util "5.11.2" - builder-util-runtime "4.2.1" + builder-util "5.16.0" + builder-util-runtime "4.4.0" chalk "^2.4.1" - dmg-builder "4.10.1" - electron-builder-lib "20.15.1" - electron-download-tf "4.3.4" - fs-extra-p "^4.6.0" + dmg-builder "4.14.0" + electron-builder-lib "20.20.4" + fs-extra-p "^4.6.1" is-ci "^1.1.0" lazy-val "^1.0.3" - read-config-file "3.0.1" + read-config-file "3.1.0" sanitize-filename "^1.6.1" update-notifier "^2.5.0" - yargs "^11.0.0" + yargs "^12.0.1" electron-chromedriver@~1.8.0: version "1.8.0" @@ -2189,20 +2087,6 @@ electron-chromedriver@~1.8.0: electron-download "^4.1.0" extract-zip "^1.6.5" -electron-download-tf@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.3.4.tgz#b03740b2885aa2ad3f8784fae74df427f66d5165" - dependencies: - debug "^3.0.0" - env-paths "^1.0.0" - fs-extra "^4.0.1" - minimist "^1.2.0" - nugget "^2.0.1" - path-exists "^3.0.0" - rc "^1.2.1" - semver "^5.4.1" - sumchecker "^2.0.2" - electron-download@^3.0.1: version "3.3.0" resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8" @@ -2242,27 +2126,15 @@ electron-osx-sign@0.4.10: minimist "^1.2.0" plist "^2.1.0" -electron-publish@20.14.6: - version "20.14.6" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.14.6.tgz#ced15b0c08fdaef2fb25beba9f55f20d1c19e215" +electron-publish@20.22.0: + version "20.22.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.22.0.tgz#352f04fc4821176e0c40a16d64b1c94026e2441f" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.11.0" - builder-util-runtime "^4.2.1" + builder-util "^5.14.0" + builder-util-runtime "^4.4.0" chalk "^2.4.1" - fs-extra-p "^4.6.0" - lazy-val "^1.0.3" - mime "^2.3.1" - -electron-publish@20.15.0: - version "20.15.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.15.0.tgz#4dd96b2ce82b8856342a6d60dda571669a390d2d" - dependencies: - bluebird-lst "^1.0.5" - builder-util "^5.11.2" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" lazy-val "^1.0.3" mime "^2.3.1" @@ -2624,7 +2496,7 @@ ethereumjs-tx@^1.3.3: ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" -ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0: +ethereumjs-util@^4.3.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6" dependencies: @@ -2646,18 +2518,6 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.2: safe-buffer "^5.1.1" secp256k1 "^3.0.1" -ethereumjs-wallet@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz#82763b1697ee7a796be7155da9dfb49b2f98cfdb" - dependencies: - aes-js "^0.2.3" - bs58check "^1.0.8" - ethereumjs-util "^4.4.0" - hdkey "^0.7.0" - scrypt.js "^0.2.0" - utf8 "^2.1.1" - uuid "^2.0.1" - ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -2959,6 +2819,12 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + dependencies: + locate-path "^3.0.0" + findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -3080,12 +2946,12 @@ fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" -fs-extra-p@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.0.tgz#c7b7117f0dcf8a99c9b2ed589067c960abcf3ef9" +fs-extra-p@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.1.tgz#6156e0cc98097f415fcd17029578fc41c78b5092" dependencies: bluebird-lst "^1.0.5" - fs-extra "^6.0.0" + fs-extra "^6.0.1" fs-extra@2.0.0: version "2.0.0" @@ -3119,15 +2985,7 @@ fs-extra@^3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^6.0.0: +fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" dependencies: @@ -3692,13 +3550,6 @@ hawk@~6.0.2: hoek "4.x.x" sntp "2.x.x" -hdkey@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632" - dependencies: - coinstring "^2.0.0" - secp256k1 "^3.0.1" - he@1.1.1, he@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -3743,10 +3594,14 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: +hosted-git-info@^2.1.4: version "2.6.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" +hosted-git-info@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" + http-errors@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" @@ -4300,7 +4155,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@^3.11.0, js-yaml@^3.9.1: +js-yaml@^3.12.0, js-yaml@^3.9.1: version "3.12.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" dependencies: @@ -4574,6 +4429,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + lodash-es@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05" @@ -5323,7 +5185,7 @@ npm-run-path@^2.0.0: gauge "~2.7.3" set-blocking "~2.0.0" -nugget@^2.0.0, nugget@^2.0.1: +nugget@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" dependencies: @@ -5544,12 +5406,24 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec" + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" dependencies: p-limit "^1.1.0" +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + dependencies: + p-limit "^2.0.0" + p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" @@ -5564,6 +5438,10 @@ p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" +p-try@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" + pac-proxy-agent@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896" @@ -5637,10 +5515,6 @@ parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" -parser-toolkit@>=0.0.3: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01" - parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" @@ -6038,7 +5912,7 @@ raw-body@2.3.3, raw-body@^2.2.0: iconv-lite "0.4.23" unpipe "1.0.0" -rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: +rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: @@ -6047,17 +5921,17 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.0.1.tgz#307ed2e162fa54306d0ae6d41e9cdc829720d2a9" +read-config-file@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.0.tgz#d433283c76f32204d6995542e4a04723db9e8308" dependencies: - ajv "^6.4.0" + ajv "^6.5.2" ajv-keywords "^3.2.0" bluebird-lst "^1.0.5" - dotenv "^5.0.1" + dotenv "^6.0.0" dotenv-expand "^4.2.0" - fs-extra-p "^4.6.0" - js-yaml "^3.11.0" + fs-extra-p "^4.6.1" + js-yaml "^3.12.0" json5 "^1.0.1" lazy-val "^1.0.3" @@ -6697,7 +6571,7 @@ sc-simple-broker@~2.1.0: dependencies: sc-channel "~1.2.0" -scrypt.js@0.2.0, scrypt.js@^0.2.0: +scrypt.js@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada" dependencies: @@ -7206,12 +7080,6 @@ stream-exhaust@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" -stream-json@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.6.1.tgz#c9413e7f42ba8eac4883be712220455f64dcea67" - dependencies: - parser-toolkit ">=0.0.3" - stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" @@ -7431,13 +7299,13 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -temp-file@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.2.tgz#54ba4084097558e8ff2ad1e4bd84841ef2804043" +temp-file@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.3.tgz#24c144994f033be1ccf6773280c8f7f1c91691a9" dependencies: async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" lazy-val "^1.0.3" term-size@^1.2.0: @@ -7817,10 +7685,6 @@ utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" -utf8@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" - util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7841,10 +7705,6 @@ uuid@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" -uuid@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -8340,6 +8200,10 @@ xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" +xregexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" + xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -8354,6 +8218,10 @@ y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" +"y18n@^3.2.1 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" @@ -8366,6 +8234,12 @@ yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" +yargs-parser@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + dependencies: + camelcase "^4.1.0" + yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" @@ -8385,19 +8259,13 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - dependencies: - camelcase "^4.1.0" - -yargs@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b" +yargs@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2" dependencies: cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" + decamelize "^2.0.0" + find-up "^3.0.0" get-caller-file "^1.0.1" os-locale "^2.0.0" require-directory "^2.1.1" @@ -8405,8 +8273,8 @@ yargs@^11.0.0: set-blocking "^2.0.0" string-width "^2.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^10.1.0" yargs@^4.3.2, yargs@^4.7.1: version "4.8.1" From 6592644710a750c8de75d132dbd533edb4ff5a5a Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:32:07 -0300 Subject: [PATCH 77/92] Simplifying travis runner --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f55644665..4162ebac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ cache: directories: - node_modules - 'interface/.meteor' - # - $HOME/.cache/electron + #- $HOME/.cache/electron #- $HOME/.cache/electron-builder script: @@ -36,13 +36,10 @@ script: docker run --rm \ --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_|METEOR_') \ -v ${PWD}:/project \ - -v ~/.cache/electron:/root/.cache/electron \ - -v ~/.cache/electron-builder:/root/.cache/electron-builder \ electronuserland/builder:wine \ - /bin/bash -c "curl https://install.meteor.com | /bin/sh; PATH=$PATH:$HOME/.meteor; yarn --link-duplicates --pure-lockfile && yarn gulp --win && yarn gulp verify-artifacts --win" + /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn gulp --win" else yarn gulp --mac - yarn gulp verify-artifacts --mac fi before_cache: - rm -rf $HOME/.cache/electron-builder/wine From 65a0c6ce550c8483dab2471baedbd33226f674e4 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:33:17 -0300 Subject: [PATCH 78/92] Updating electron-builder; removing postinstall steps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 96ed7c3dd..2721a832e 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", + "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", "gulp": "gulp" From 155c7a96b93c82930a80df8cdfed4a5e774ba625 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:34:40 -0300 Subject: [PATCH 79/92] Adding dockerfile and docker runner script --- Dockerfile | 21 +++++++++++++++++++++ docker.sh | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100644 Dockerfile create mode 100755 docker.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..b66e6145c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM electronuserland/builder:wine + +RUN apt-get update && apt-get install nsis -y +# +# Per Meteor requirements, we shouldn't run meteor from root user. +# Here we create an user along with its home directory. +# https://github.com/meteor/meteor/issues/7939 +# https://github.com/meteor/meteor/issues/7959 +# +RUN useradd mistuser +RUN mkdir -p /home/mistuser +RUN chown -R mistuser /home/mistuser +RUN chown -R mistuser /project +USER mistuser + +ENV PATH="${PATH}:/home/mistuser/.meteor" +RUN curl https://install.meteor.com/?version=1.6.1 | /bin/sh +RUN which meteor + +# electron-builder flag +ENV USE_HARD_LINKS="true" diff --git a/docker.sh b/docker.sh new file mode 100755 index 000000000..41409c907 --- /dev/null +++ b/docker.sh @@ -0,0 +1,7 @@ +#!/bin/bash +docker run --rm \ + --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ + -v ${PWD}:/project \ + mist-electron:latest \ + /bin/bash -c "echo $HOME; yarn --link-duplicates --pure-lockfile && yarn gulp --win" + From a974cda0e10d44c48c21657c8830946eaa33ccda Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 13:38:33 -0300 Subject: [PATCH 80/92] Temporarily disabling some time-consuming build steps --- gulpfile.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 1a32c497a..83a6062e7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,7 +71,7 @@ gulp.task('upload-queue', gulp.series('checksums', 'upload-binaries')); const skipTasks = options.skipTasks.replace(/\s/g, '').split(','); const tasks = [ 'clean-dist', - 'pack-wallet', + //'pack-wallet', 'copy-app-source-files', 'transpile-main', 'transpile-modules', @@ -80,8 +80,9 @@ const tasks = [ 'bundling-interface', 'copy-i18n', 'build-dist', - 'release-dist', - 'build-nsis' + 'release-dist' + //'build-nsis', + //'verify-artifacts' ].filter(task => !skipTasks.includes(task)); gulp.task('default', gulp.series(tasks)); From b01fd9d5734c99125d4d87654882d1cb6c1b87b1 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 16 Jul 2018 23:07:07 -0300 Subject: [PATCH 81/92] Config updates --- Dockerfile | 5 +- gulpTasks/building.js | 2 +- interface/package-lock.json | 27 ------ package.json | 4 +- yarn.lock | 186 +++--------------------------------- 5 files changed, 18 insertions(+), 206 deletions(-) delete mode 100644 interface/package-lock.json diff --git a/Dockerfile b/Dockerfile index b66e6145c..9fb21d3e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,9 @@ RUN chown -R mistuser /project USER mistuser ENV PATH="${PATH}:/home/mistuser/.meteor" -RUN curl https://install.meteor.com/?version=1.6.1 | /bin/sh +RUN curl https://install.meteor.com/ | /bin/sh RUN which meteor -# electron-builder flag +# electron-builder flags ENV USE_HARD_LINKS="true" +ENV DEBUG=electron-builder diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 0f57fb1fd..93eddd8c8 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -132,7 +132,7 @@ gulp.task('build-dist', cb => { homepage: 'https://github.com/ethereum/mist', build: { appId: `org.ethereum.${type}`, - asar: false, + asar: true, directories: { buildResources: '../build', output: '../dist' diff --git a/interface/package-lock.json b/interface/package-lock.json deleted file mode 100644 index 5924bbe23..000000000 --- a/interface/package-lock.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "Mist-Interface", - "version": "0.1.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@babel/runtime": { - "version": "7.0.0-beta.42", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz", - "integrity": "sha512-iOGRzUoONLOtmCvjUsZv3mZzgCT6ljHQY5fr1qG1QIiJQwtM7zbPWGGpa3QWETq+UqwWyJnoi5XZDZRwZDFciQ==", - "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } - } -} diff --git a/package.json b/package.json index 2721a832e..f7332e5af 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,10 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; git submodule update --recursive; echo INSTALLINGMETEOR && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", + "postinstall": "electron-builder install-app-deps; git submodule update --recursive; which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", - "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", "gulp": "gulp" @@ -70,7 +69,6 @@ "ecstatic": "^2.1.0", "electron": "1.8.4", "electron-builder": "^20.17.2", - "electron-rebuild": "^1.7.3", "eslint": "^4.19.1", "eslint-config-prettier": "^2.9.0", "eslint-plugin-import": "^2.12.0", diff --git a/yarn.lock b/yarn.lock index f364421db..c386f4c6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -53,13 +53,6 @@ ajv-keywords@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" @@ -1314,10 +1307,6 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-spinners@^1.0.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" - cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -1414,7 +1403,7 @@ color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" -colors@^1.1.2, colors@^1.3.0: +colors@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e" @@ -1684,7 +1673,7 @@ dateformat@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" -debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.5.1, debug@^2.6.3, debug@^2.6.8, debug@^2.6.9: +debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1896,7 +1885,7 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -2138,21 +2127,6 @@ electron-publish@20.22.0: lazy-val "^1.0.3" mime "^2.3.1" -electron-rebuild@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.7.3.tgz#24ae06ad9dd61cb7e4d688961f49118c40a110eb" - dependencies: - colors "^1.1.2" - debug "^2.6.3" - detect-libc "^1.0.3" - fs-extra "^3.0.1" - node-abi "^2.0.0" - node-gyp "^3.6.0" - ora "^1.2.0" - rimraf "^2.6.1" - spawn-rx "^2.0.10" - yargs "^7.0.2" - electron-redux@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/electron-redux/-/electron-redux-1.3.1.tgz#650a76cdeb12358f57b5c7db744224d08999ae08" @@ -2912,14 +2886,6 @@ form-data@~2.0.0: combined-stream "^1.0.5" mime-types "^2.1.11" -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - form-data@~2.3.0, form-data@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" @@ -2977,14 +2943,6 @@ fs-extra@^2.0.0, fs-extra@^2.1.2: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" @@ -3026,7 +2984,7 @@ fsevents@^1.1.2: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2, fstream@^1.0.8, fstream@~1.0.10: +fstream@^1.0.2, fstream@^1.0.8, fstream@~1.0.10: version "1.0.11" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: @@ -3412,10 +3370,6 @@ gulplog@^1.0.0: dependencies: glogg "^1.0.0" -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -3429,13 +3383,6 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - har-validator@~5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" @@ -4194,7 +4141,7 @@ json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: +json-stable-stringify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" dependencies: @@ -4228,12 +4175,6 @@ jsonfile@^2.1.0, jsonfile@^2.2.3: optionalDependencies: graceful-fs "^4.1.6" -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -4487,7 +4428,7 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: +lodash.assign@^4.0.3, lodash.assign@^4.0.6: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -4578,12 +4519,6 @@ log-rotate@^0.2.7: version "0.2.8" resolved "https://registry.yarnpkg.com/log-rotate/-/log-rotate-0.2.8.tgz#1003c89ece53b5fe8a28dbc4d70bcada9d61b8c5" -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - log4js@^2.4.1: version "2.8.0" resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.8.0.tgz#9f42fcc4fe82004dfd136604dd7bc1c35d61d6c5" @@ -5008,12 +4943,6 @@ next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -node-abi@^2.0.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923" - dependencies: - semver "^5.4.1" - node-fetch@^1.0.1, node-fetch@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -5021,23 +4950,6 @@ node-fetch@^1.0.1, node-fetch@^1.7.3: encoding "^0.1.11" is-stream "^1.0.1" -node-gyp@^3.6.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.7.0.tgz#789478e8f6c45e277aa014f3e28f958f286f9203" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request ">=2.9.0 <2.82.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-pre-gyp@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46" @@ -5117,12 +5029,6 @@ nodemailer@^2.5.0: nodemailer-smtp-transport "2.7.2" socks "1.1.9" -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -5176,7 +5082,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2: +npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -5336,15 +5242,6 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - ordered-read-streams@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" @@ -5381,7 +5278,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0, osenv@^0.1.4: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" dependencies: @@ -5605,10 +5502,6 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -5857,10 +5750,6 @@ qs@~6.2.0: version "6.2.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe" -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - query-string@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" @@ -6241,33 +6130,6 @@ request@2.75.x: tough-cookie "~2.3.0" tunnel-agent "~0.4.1" -"request@>=2.9.0 <2.82.0": - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - request@^2.0.0, request@^2.45.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.85.0: version "2.87.0" resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" @@ -6450,12 +6312,6 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs@^5.1.1: - version "5.5.11" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" - dependencies: - symbol-observable "1.0.1" - safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -6625,14 +6481,10 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - send@0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -6967,14 +6819,6 @@ sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" -spawn-rx@^2.0.10: - version "2.0.12" - resolved "https://registry.yarnpkg.com/spawn-rx/-/spawn-rx-2.0.12.tgz#b6285294499426089beea0c3c1ec32d7fc57a376" - dependencies: - debug "^2.5.1" - lodash.assign "^4.2.0" - rxjs "^5.1.1" - spawn-sync@^1.0.15: version "1.0.15" resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" @@ -7238,10 +7082,6 @@ swarm-js@0.1.37, swarm-js@^0.1.21: tar.gz "^1.0.5" xhr-request-promise "^0.1.2" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - symbol-observable@^1.0.2, symbol-observable@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -7279,7 +7119,7 @@ tar.gz@^1.0.5: mout "^0.11.0" tar "^2.1.1" -tar@^2.0.0, tar@^2.1.1: +tar@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -7705,7 +7545,7 @@ uuid@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" -uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: +uuid@^3.0.1, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -8055,7 +7895,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.14, which@^1.2.4, which@^1.2.9: +which@^1.2.14, which@^1.2.4, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: @@ -8295,7 +8135,7 @@ yargs@^4.3.2, yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^7.0.2, yargs@^7.1.0: +yargs@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" dependencies: From c412cc8d0d8d4dbe029e06c2b85c78fc0c15a63c Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 18 Jul 2018 20:29:20 -0300 Subject: [PATCH 82/92] Fixing gitmodules --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a2c7f172a..1a1fb6e7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "dapp-styles"] path = interface/public/dapp-styles url = git://github.com/ethereum/dapp-styles.git -[submodule "wallet"] - path = wallet - url = https://github.com/ethereum/meteor-dapp-wallet.git [submodule "meteor-dapp-wallet"] path = meteor-dapp-wallet url = https://github.com/ethereum/meteor-dapp-wallet.git From e9ff07089aac4fb443953c61bb980ba2ef6308e9 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 18 Jul 2018 20:30:00 -0300 Subject: [PATCH 83/92] Selecting artifacts to upload --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4162ebac3..03012a0c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ matrix: addons: artifacts: true paths: - - $(ls dist_mist/release/* | tr "\n" ":") - - $(ls dist_wallet/release/* | tr "\n" ":") + - $(git ls-files -o | grep -E "^dist_(mist|wallet)/release" | tr "\n" ":") cache: directories: From aded176d75c21ad83d5a223a2bc9be223e3fbe7e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Wed, 18 Jul 2018 22:24:54 -0300 Subject: [PATCH 84/92] Removing electron-builder install-all-deps as we do not use two package.json files setup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7332e5af..87885e9b3 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; git submodule update --recursive; which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", + "postinstall": "git submodule update --recursive; which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", From 9e7c11e198b751be7e2afc4e6f38f144180fd527 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 10:34:00 -0300 Subject: [PATCH 85/92] Building on windows changes --- gulpTasks/building.js | 18 +++++++++++++----- gulpfile.js | 8 ++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 93eddd8c8..14faf8a98 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -76,10 +76,11 @@ gulp.task('pack-wallet', cb => { if (options.type == 'mist') { del(['./wallet']).then(() => { console.log('Building wallet...'); + const buildPath = path.join('..', '..', 'wallet'); exec( `cd meteor-dapp-wallet/app \ && yarn install \ - && ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, + && "../../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, (err, stdout, stderr) => { console.log(stdout, stderr); cb(err); @@ -94,9 +95,8 @@ gulp.task('pack-wallet', cb => { gulp.task('bundling-interface', cb => { const bundle = additionalCommands => { const buildPath = path.join('..', `dist_${type}`, 'app', 'interface'); - exec( - `../node_modules/.bin/meteor-build-client ${buildPath} -p "" ${additionalCommands}`, + `"../node_modules/.bin/meteor-build-client" ${buildPath} -p "" ${additionalCommands}`, { cwd: 'interface' }, (err, stdout) => { console.log(stdout); @@ -106,9 +106,17 @@ gulp.task('bundling-interface', cb => { }; if (type === 'wallet') { - bundle(`&& cd ../meteor-dapp-wallet/app \ + const walletPath = path.join('..', 'meteor-dapp-wallet', 'app'); + const walletBuildPath = path.join( + '..', + `dist_${type}`, + 'app', + 'interface', + 'wallet' + ); + bundle(`&& cd ${walletPath} \ && yarn install \ - && ../../node_modules/.bin/meteor-build-client ../dist_${type}/app/interface/wallet -p ""`); + && "../../node_modules/.bin/meteor-build-client" ${walletBuildPath} p ""`); } else { bundle(); } diff --git a/gulpfile.js b/gulpfile.js index 83a6062e7..56ac07966 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,7 +71,7 @@ gulp.task('upload-queue', gulp.series('checksums', 'upload-binaries')); const skipTasks = options.skipTasks.replace(/\s/g, '').split(','); const tasks = [ 'clean-dist', - //'pack-wallet', + 'pack-wallet', 'copy-app-source-files', 'transpile-main', 'transpile-modules', @@ -80,9 +80,9 @@ const tasks = [ 'bundling-interface', 'copy-i18n', 'build-dist', - 'release-dist' - //'build-nsis', - //'verify-artifacts' + 'release-dist', + 'build-nsis', + 'verify-artifacts' ].filter(task => !skipTasks.includes(task)); gulp.task('default', gulp.series(tasks)); From b79888abd4d557b454b5ecaac41cbc300693354b Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 12:15:43 -0300 Subject: [PATCH 86/92] Simplifying wallet build workflow --- gulpTasks/building.js | 70 +++++++++++++++++++------------------------ gulpfile.js | 1 + package.json | 2 +- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 14faf8a98..4329e7d1d 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -73,53 +73,43 @@ gulp.task('switch-production', cb => { }); gulp.task('pack-wallet', cb => { - if (options.type == 'mist') { - del(['./wallet']).then(() => { - console.log('Building wallet...'); - const buildPath = path.join('..', '..', 'wallet'); - exec( - `cd meteor-dapp-wallet/app \ - && yarn install \ - && "../../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, - (err, stdout, stderr) => { - console.log(stdout, stderr); - cb(err); - } - ); - }); - } else { - cb(); - } -}); - -gulp.task('bundling-interface', cb => { - const bundle = additionalCommands => { - const buildPath = path.join('..', `dist_${type}`, 'app', 'interface'); + del(['./wallet']).then(() => { + console.log('Building wallet...'); + const buildPath = path.join('..', '..', 'wallet'); exec( - `"../node_modules/.bin/meteor-build-client" ${buildPath} -p "" ${additionalCommands}`, - { cwd: 'interface' }, - (err, stdout) => { - console.log(stdout); + `cd meteor-dapp-wallet/app \ + && yarn install \ + && "../../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, + (err, stdout, stderr) => { + console.log(stdout, stderr); cb(err); } ); - }; + }); +}); +// Currently, Mist and Ethereum Wallet expects ./wallet/ to be in different paths. This task aims to fulfill this requirement. +gulp.task('move-wallet', cb => { if (type === 'wallet') { - const walletPath = path.join('..', 'meteor-dapp-wallet', 'app'); - const walletBuildPath = path.join( - '..', - `dist_${type}`, - 'app', - 'interface', - 'wallet' - ); - bundle(`&& cd ${walletPath} \ - && yarn install \ - && "../../node_modules/.bin/meteor-build-client" ${walletBuildPath} p ""`); - } else { - bundle(); + console.debug('Moving ./wallet to ./interface/wallet'); + const basePath = path.join('dist_wallet', 'app'); + const fromPath = path.join(basePath, 'wallet'); + const toPath = path.join(basePath, 'interface', 'wallet'); + shell.mv(fromPath, toPath); } + cb(); +}); + +gulp.task('bundling-interface', cb => { + const buildPath = path.join('..', `dist_${type}`, 'app', 'interface'); + exec( + `"../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, + { cwd: 'interface' }, + (err, stdout) => { + console.log(stdout); + cb(err); + } + ); }); gulp.task('copy-i18n', () => { diff --git a/gulpfile.js b/gulpfile.js index 56ac07966..c3842ac98 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,6 +78,7 @@ const tasks = [ 'copy-build-folder-files', 'switch-production', 'bundling-interface', + 'move-wallet', 'copy-i18n', 'build-dist', 'release-dist', diff --git a/package.json b/package.json index 87885e9b3..ade63b11e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "git submodule update --recursive; which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh; (cd interface && yarn)", + "postinstall": "git submodule update --recursive && (cd interface && yarn) && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", From 93c56ba7bb7f3af0c87de78001c9f4c0aa13b5c1 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 19:24:13 -0300 Subject: [PATCH 87/92] Updates to CI workflow --- .travis.yml | 92 +++++++++++++++++++++++++++++++++-------------------- Dockerfile | 22 ------------- docker.sh | 7 ---- 3 files changed, 58 insertions(+), 63 deletions(-) delete mode 100644 Dockerfile delete mode 100755 docker.sh diff --git a/.travis.yml b/.travis.yml index 03012a0c2..d68622ed7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,45 +1,69 @@ +language: node_js +node_js: '8' +cache: + yarn: true + directories: + - node_modules + - 'interface/.meteor' + +sudo: required + +addons: + artifacts: + paths: + - $(git ls-files -o | grep -E "^dist_(mist|wallet)/release" | tr "\n" ":") + matrix: include: - - os: osx - osx_image: xcode9.4 - language: node_js - node_js: "10" + # LINUX + - os: linux + dist: trusty env: - - ELECTRON_CACHE=$HOME/.cache/electron - - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder + - GULP_PLATFORM=linux + addons: + apt: + packages: + - icnsutils + - graphicsmagick + - xz-utils + - gcc-multilib + - g++-multilib - - os: linux - services: docker - language: generic + # MAC + - os: osx + osx_image: xcode8.3 # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060) env: - - METEOR_UNSAFE_PERM=true - - METEOR_NO_RELEASE_CHECK=true -addons: - artifacts: true - paths: - - $(git ls-files -o | grep -E "^dist_(mist|wallet)/release" | tr "\n" ":") + - GULP_PLATFORM=mac + before_install: + - npm install -g yarn # macOS xcode8 image doesn't natively support yarn yet -cache: - directories: - - node_modules - - 'interface/.meteor' - #- $HOME/.cache/electron - #- $HOME/.cache/electron-builder + fast_finish: true + + +install: + - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + + - yarn + + # prepare integration tests + - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3 + + # disable macOS code-signing (production certificate) on develop branch + - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi script: + - yarn test:unit:once + + - yarn gulp --mist --$GULP_PLATFORM + + - yarn gulp --wallet --$GULP_PLATFORM + + - yarn gulp test - - yarn global add gulp-cli meteor-build-client - - - | - if [ "$TRAVIS_OS_NAME" == "linux" ]; then - docker run --rm \ - --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_|METEOR_') \ - -v ${PWD}:/project \ - electronuserland/builder:wine \ - /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn gulp --win" - else - yarn gulp --mac +after_success: + -| + if [[ $TRAVIS_BRANCH == "master" ]]; then + gulp upload-queue --$GULP_PLATFORM; + gulp upload-queue --wallet --$GULP_PLATFORM; fi -before_cache: - - rm -rf $HOME/.cache/electron-builder/wine diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 9fb21d3e5..000000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM electronuserland/builder:wine - -RUN apt-get update && apt-get install nsis -y -# -# Per Meteor requirements, we shouldn't run meteor from root user. -# Here we create an user along with its home directory. -# https://github.com/meteor/meteor/issues/7939 -# https://github.com/meteor/meteor/issues/7959 -# -RUN useradd mistuser -RUN mkdir -p /home/mistuser -RUN chown -R mistuser /home/mistuser -RUN chown -R mistuser /project -USER mistuser - -ENV PATH="${PATH}:/home/mistuser/.meteor" -RUN curl https://install.meteor.com/ | /bin/sh -RUN which meteor - -# electron-builder flags -ENV USE_HARD_LINKS="true" -ENV DEBUG=electron-builder diff --git a/docker.sh b/docker.sh deleted file mode 100755 index 41409c907..000000000 --- a/docker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -docker run --rm \ - --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \ - -v ${PWD}:/project \ - mist-electron:latest \ - /bin/bash -c "echo $HOME; yarn --link-duplicates --pure-lockfile && yarn gulp --win" - From 30ffbc5c750bb8a2135495925091d61c664365af Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 19:57:42 -0300 Subject: [PATCH 88/92] Updating docs --- README.md | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index fd2768f24..2ff0d0cec 100644 --- a/README.md +++ b/README.md @@ -81,14 +81,6 @@ $ cd mist $ yarn ``` -To update Mist in the future, run: - -```bash -$ cd mist -$ git pull -$ yarn -``` - ### Run Mist For development we start the interface with a Meteor server for auto-reload etc. @@ -206,13 +198,13 @@ $ brew install gnu-tar libicns graphicsmagick xz To generate the binaries for Mist run: ```bash -$ gulp +$ yarn gulp ``` To generate the Ethereum Wallet: ```bash -$ gulp --wallet +$ yarn gulp --wallet ``` The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. From 0.11.0, both Ethereum Wallet and Mist bundle a meteor-dapp-wallet instance (https://github.com/ethereum/meteor-dapp-wallet). @@ -224,41 +216,27 @@ The generated binaries will be under `dist_mist/release` or `dist_wallet/release To build binaries for specific platforms (default: all available) use the following flags: ```bash -$ gulp --mac # mac -$ gulp --linux # linux -$ gulp --win # windows +$ yarn gulp --mac # mac +$ yarn gulp --linux # linux +$ yarn gulp --win # windows ``` -##### walletSource - -With the `walletSource` you can specify the Wallet branch to use, default is `master`: - - $ gulp --wallet --walletSource local - -Options are: - -- `master` -- [any meteor-dapp-wallet branch](https://github.com/ethereum/meteor-dapp-wallet/branches) -- `local` Will try to build the wallet from [mist/]../meteor-dapp-wallet/app - -_Note: applicable only when combined with `--wallet`_ - ##### skipTasks When building a binary, you can optionally skip some tasks — generally for testing purposes. ```bash -$ gulp --mac --skipTasks=bundling-interface,release-dist +$ yarn gulp --mac --skipTasks=bundling-interface,release-dist ``` ##### Checksums -Spits out the MD5 checksums of the distributables. +Prints the SHA-256 checksums of the distributables. It expects installer/zip files to be in the generated folders e.g. `dist_mist/release` ```bash -$ gulp checksums [--wallet] +$ yarn gulp checksums [--wallet] ``` #### Cutting a release @@ -284,13 +262,13 @@ Tests run using [Spectron](https://github.com/electron/spectron/), a webdriver.i First make sure to build Mist with: ```bash -$ gulp +$ yarn gulp ``` Then run the tests: ```bash -$ gulp test +$ yarn gulp test ``` _Note: Integration tests are not yet supported on Windows._ From 2aa553891dfdd4c4e1c65ec24084777541ebbd6e Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 20:56:27 -0300 Subject: [PATCH 89/92] Tweak artifacts config; Pruning code --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index d68622ed7..2d104ba4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,9 @@ cache: sudo: required -addons: - artifacts: +artifact_config: &artifact_config paths: - - $(git ls-files -o | grep -E "^dist_(mist|wallet)/release" | tr "\n" ":") + - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) matrix: include: @@ -21,6 +20,8 @@ matrix: env: - GULP_PLATFORM=linux addons: + artifacts: + <<&artifacts_config apt: packages: - icnsutils @@ -28,27 +29,27 @@ matrix: - xz-utils - gcc-multilib - g++-multilib - + before_install: + # prepare integration tests + - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start + # MAC - os: osx - osx_image: xcode8.3 # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060) + osx_image: xcode8.3 env: - GULP_PLATFORM=mac + addons: + artifacts: + <<&artifacts_config before_install: - - npm install -g yarn # macOS xcode8 image doesn't natively support yarn yet - - fast_finish: true - + - npm install -g yarn install: - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - yarn - # prepare integration tests - - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3 - - # disable macOS code-signing (production certificate) on develop branch + # only code signs when on master - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi script: @@ -61,8 +62,7 @@ script: - yarn gulp test after_success: - -| - if [[ $TRAVIS_BRANCH == "master" ]]; then + - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM; gulp upload-queue --wallet --$GULP_PLATFORM; fi From b0c2eec20684781766f75da6a3a963462905f206 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Thu, 19 Jul 2018 21:09:13 -0300 Subject: [PATCH 90/92] Poking with travis syntax --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d104ba4d..a93be47eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,6 @@ cache: sudo: required -artifact_config: &artifact_config - paths: - - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) - matrix: include: # LINUX @@ -21,7 +17,8 @@ matrix: - GULP_PLATFORM=linux addons: artifacts: - <<&artifacts_config + paths: + - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) apt: packages: - icnsutils @@ -40,7 +37,8 @@ matrix: - GULP_PLATFORM=mac addons: artifacts: - <<&artifacts_config + paths: + - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) before_install: - npm install -g yarn From 01d87864e9eb51cc34b612468980b34653c75375 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 23 Jul 2018 12:09:51 -0300 Subject: [PATCH 91/92] simplifying yarn tasks --- .circleci/config.yml | 62 ++++---------------------------------------- .travis.yml | 10 +++---- package.json | 7 ++++- 3 files changed, 16 insertions(+), 63 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8a38a46b..4346afc7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,22 +28,14 @@ linux_dependencies: &linux_dependencies sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils && sudo apt-get install graphicsmagick -windows_dependencies: &windows_dependencies - name: Windows package dependencies - command: | - sudo apt-get install software-properties-common && - sudo dpkg --add-architecture i386 && - sudo add-apt-repository ppa:ubuntu-wine/ppa -y && - sudo apt-get install --no-install-recommends -y mono-devel nsis ca-certificates-mono wine1.8 - install_meteor: &install_meteor name: Installing Meteor # PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh command: which meteor || curl https://install.meteor.com | /bin/sh install_node_modules: &install_node_modules - name: Installing node modules using yarn - command: yarn global add gulp-cli meteor-build-client && yarn + name: Installing node dependencies using yarn + command: yarn # Javascript Node CircleCI 2.0 configuration file @@ -96,8 +88,7 @@ jobs: - run: <<: *install_node_modules - - run: yarn run gulp --linux - - run: yarn run gulp verify-artifacts --mist --linux + - run: yarn build:mist --linux - store_artifacts: path: dist_mist/release @@ -115,50 +106,7 @@ jobs: - run: <<: *install_node_modules - - run: yarn run gulp --wallet --linux - - run: yarn run gulp verify-artifacts --wallet --linux - - - store_artifacts: - path: dist_wallet/release - - mist-windows: - <<: *defaults - steps: - - attach_workspace: - at: /home/circleci/ - - - run: - <<: *linux_dependencies - - run: - <<: *windows_dependencies - - run: - <<: *install_meteor - - run: - <<: *install_node_modules - - - run: yarn run gulp --win - - run: yarn run gulp verify-artifacts --mist --win - - - store_artifacts: - path: dist_mist/release - - wallet-windows: - <<: *defaults - steps: - - attach_workspace: - at: /home/circleci/ - - - run: - <<: *linux_dependencies - - run: - <<: *windows_dependencies - - run: - <<: *install_meteor - - run: - <<: *install_node_modules - - - run: yarn run gulp --wallet --win - - run: yarn run gulp verify-artifacts --wallet --win + - run: yarn build:wallet --linux - store_artifacts: path: dist_wallet/release @@ -169,7 +117,7 @@ jobs: steps: - attach_workspace: at: /home/circleci/ - - run: xvfb-run yarn run gulp test + - run: xvfb-run yarn test:e2e unit-test: <<: *defaults diff --git a/.travis.yml b/.travis.yml index a93be47eb..1ef0174b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,15 +53,15 @@ install: script: - yarn test:unit:once - - yarn gulp --mist --$GULP_PLATFORM + - yarn build:mist --$GULP_PLATFORM - - yarn gulp --wallet --$GULP_PLATFORM + - yarn build:wallet --$GULP_PLATFORM - - yarn gulp test + - yarn test:e2e after_success: - if [[ $TRAVIS_BRANCH == "master" ]]; then - gulp upload-queue --$GULP_PLATFORM; - gulp upload-queue --wallet --$GULP_PLATFORM; + yarn dist:mist --$GULP_PLATFORM; + yarn dist:wallet --$GULP_PLATFORM; fi diff --git a/package.json b/package.json index ade63b11e..d6724ef71 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,12 @@ "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", - "gulp": "gulp" + "test:e2e": "gulp test", + "build:wallet": "gulp --wallet", + "build:mist": "gulp --mist", + "dist:mist": "gulp upload-queue --mist", + "dist:wallet": "gulp upload-queue --wallet", + "task": "gulp" }, "main": "main.js", "dependencies": { From eed075321b3e4f14e558157f538f7c3dda18ec01 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Mon, 23 Jul 2018 12:17:38 -0300 Subject: [PATCH 92/92] Updating docs --- README.md | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2ff0d0cec..7fc596ca8 100644 --- a/README.md +++ b/README.md @@ -198,13 +198,13 @@ $ brew install gnu-tar libicns graphicsmagick xz To generate the binaries for Mist run: ```bash -$ yarn gulp +$ yarn build:mist ``` To generate the Ethereum Wallet: ```bash -$ yarn gulp --wallet +$ yarn build:wallet ``` The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. From 0.11.0, both Ethereum Wallet and Mist bundle a meteor-dapp-wallet instance (https://github.com/ethereum/meteor-dapp-wallet). @@ -216,9 +216,9 @@ The generated binaries will be under `dist_mist/release` or `dist_wallet/release To build binaries for specific platforms (default: all available) use the following flags: ```bash -$ yarn gulp --mac # mac -$ yarn gulp --linux # linux -$ yarn gulp --win # windows +$ yarn build:mist --mac # mac +$ yarn build:mist --linux # linux +$ yarn build:mist --win # windows ``` ##### skipTasks @@ -226,7 +226,7 @@ $ yarn gulp --win # windows When building a binary, you can optionally skip some tasks — generally for testing purposes. ```bash -$ yarn gulp --mac --skipTasks=bundling-interface,release-dist +$ yarn build:mist --mac --skipTasks=bundling-interface,release-dist ``` ##### Checksums @@ -236,7 +236,15 @@ Prints the SHA-256 checksums of the distributables. It expects installer/zip files to be in the generated folders e.g. `dist_mist/release` ```bash -$ yarn gulp checksums [--wallet] +$ yarn task checksums [--wallet] +``` + +#### Tasks found in gulpfile.js and gulpTasks/ + +Any other gulp task can be run using `yarn task`. + +```bash +$ yarn task clean-dist ``` #### Cutting a release @@ -262,13 +270,14 @@ Tests run using [Spectron](https://github.com/electron/spectron/), a webdriver.i First make sure to build Mist with: ```bash -$ yarn gulp +$ yarn build:mist ``` Then run the tests: ```bash -$ yarn gulp test +$ yarn test:unit:once +$ yarn test:e2e ``` _Note: Integration tests are not yet supported on Windows._