Merge pull request #265 from theQRL/testnet

Updates Meteor, Supports CircleCI v2, Update to 1.0.2
theQRL · Aug 17, 2018 · 5a22f5f · 5a22f5f
2 parents 2e20b81 + a028f46
commit 5a22f5f
Show file tree

Hide file tree

Showing 11 changed files with 1,987 additions and 2,286 deletions.
diff --git a/.circleci-v2/config.yml → .circleci/config.yml b/.circleci-v2/config.yml → .circleci/config.yml
@@ -42,39 +42,36 @@ jobs:
             npm install -g electrify-qrl
             cd .electrify && npm install
             meteor npm install --unsafe-perm
-            meteor npm install --save @babel/runtime mathjs qrllib meteor-node-stubs aes256 @theqrl/validate-qrl-address json-formatter-js @theqrl/explorer-helpers grpc tmp async
             meteor node -e 'console.log("I am Node.js %s!", process.version);'
 
       # Start meteor in background
       - run:
           name: Start Meteor
-          command: npm run dev
+          command: |
+            meteor npm install --unsafe-perm
+            npm run dev
           background: true
 
       # Run unit tests
       - run:
           name: Run selenium tests
           command: |
             until curl --max-time 300 http://localhost:3000/; do sleep 1; done
-            chimp --ddp=http://localhost:3000 --browser=chrome --path=tests
-
-      # Run unit tests
-      - run:
-          name: Temp run electrify build
-          command: |
-            ls -la .meteor/local/dev_bundle/
-            ls -la .meteor/local/dev_bundle/bin/
-            rm -rf .electrify/.dist/
-            mkdir .electrify/.dist
-            electrify package -o .electrify/.dist/
+            npm install -g chimp
+            npm install -g selenium-standalone
+            /usr/local/Cellar/node/8.6.0/bin/chimp --ddp=http://localhost:3000 --browser=chrome --path=tests
 
       # Create package on master
       - deploy:
           command:  |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               rm -rf .electrify/.dist/
               mkdir .electrify/.dist
-              electrify package -o .electrify/.dist/
+              npm install -g electrify-qrl
+              meteor npm install --unsafe-perm
+              /usr/local/Cellar/node/8.6.0/bin/electrify package -o .electrify/.dist/
+              cd .electrify/.dist/ && zip -r QRL-Wallet-Macos.zip QRLWallet-darwin-x64
+              rm -rf QRLWallet-darwin-x64
             fi
 
       # Save artifacts