Merge pull request #1166 from nervosnetwork/rc/v0.25.2

[ᚬmaster] Rc/v0.25.2

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [0.25.2](https://github.com/nervosnetwork/neuron/compare/v0.25.1...v0.25.2) (2019-11-29)
+
+
+### Bug Fixes
+
+* also clean lock/dao info in renderer process ([a0b2470](https://github.com/nervosnetwork/neuron/commit/a0b2470))
+* Fix the problem that balance not right if switch network from default network ([0f763a5](https://github.com/nervosnetwork/neuron/commit/0f763a5))
+* remove bufferTime for address created event ([9b0a077](https://github.com/nervosnetwork/neuron/commit/9b0a077))
+* the missing txs ([ed557b6](https://github.com/nervosnetwork/neuron/commit/ed557b6))
+* **neuron-ui:** remove www from docs.nervos.org ([3fc8154](https://github.com/nervosnetwork/neuron/commit/3fc8154))
+* balance not update after sent tx ([65e51dd](https://github.com/nervosnetwork/neuron/commit/65e51dd))
+* **neuron-ui:** show 0 if withdraw rpc returns errors ([b714376](https://github.com/nervosnetwork/neuron/commit/b714376))
+* clean lock utils info and dao utils info when switch network ([60ec486](https://github.com/nervosnetwork/neuron/commit/60ec486))
+* initialize NetworksService in renderer process ([73f1bf0](https://github.com/nervosnetwork/neuron/commit/73f1bf0))
+* network switch event broadcast twice ([f1b0f72](https://github.com/nervosnetwork/neuron/commit/f1b0f72))
+* pending in windows when network off ([67dcb79](https://github.com/nervosnetwork/neuron/commit/67dcb79))
+* sign witnesses test ([5000edd](https://github.com/nervosnetwork/neuron/commit/5000edd))
+
+
+### Features
+
+* **neuron-ui:** update the url to nervos dao rfc ([6b68ab6](https://github.com/nervosnetwork/neuron/commit/6b68ab6))
+* Add API for downloading and installing updates ([b8d24ca](https://github.com/nervosnetwork/neuron/commit/b8d24ca))
+* Add app updater subject and state ([423109d](https://github.com/nervosnetwork/neuron/commit/423109d))
+* Adding check update to settings view ([98fe06c](https://github.com/nervosnetwork/neuron/commit/98fe06c))
+* Connect updater events to UI ([b267321](https://github.com/nervosnetwork/neuron/commit/b267321))
+* Delete unused updater translations ([bcafce8](https://github.com/nervosnetwork/neuron/commit/bcafce8))
+* Different stage status of checking updates ([cd82ca4](https://github.com/nervosnetwork/neuron/commit/cd82ca4))
+* Polish updater i18n translations and UI ([af45f0c](https://github.com/nervosnetwork/neuron/commit/af45f0c))
+* Show release notes when there's update available ([8cf9581](https://github.com/nervosnetwork/neuron/commit/8cf9581))
+* Trigger check updates menu item enabling/disabling ([cd8e5d5](https://github.com/nervosnetwork/neuron/commit/cd8e5d5))
+* **neuron-ui:** add copy address and copy tx hash context menus on the tx detail view. ([7d86454](https://github.com/nervosnetwork/neuron/commit/7d86454))
+
+
+
 ## [0.25.1](https://github.com/nervosnetwork/neuron/compare/v0.25.0...v0.25.1) (2019-11-18)
 
 

azure-pipelines.yml

@@ -16,8 +16,12 @@ pr:
     include:
       - '*'
 
-jobs:
-  - job: macOS
+stages:
+- stage: unit_tests
+  displayName: Unit Tests
+  jobs:
+  - job: mac
+    displayName: macOS
     pool:
       vmImage: 'macos-10.14'
     strategy:
@@ -37,9 +41,10 @@ jobs:
     - script: CI=true yarn test
       name: Test
 
-  - job: Linux
+  - job: linux
+    displayName: Linux
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
     strategy:
       matrix:
         node_12_x:
@@ -60,7 +65,8 @@ jobs:
         CI=true yarn test
       name: Test
 
-  - job: Windows
+  - job: win
+    displayName: Windows
     pool:
       vmImage: 'windows-2019'
     strategy:
@@ -84,7 +90,12 @@ jobs:
         yarn test
       name: Test
 
+- stage: e2e_tests
+  displayName: Integration Tests
+  dependsOn: []
+  jobs:
   - job: Integration
+    displayName: Integration Tests
     pool:
       vmImage: 'macos-10.14'
     steps:
@@ -99,8 +110,12 @@ jobs:
     - script: yarn test:e2e
       name: Test
 
-  - job: Release
-    condition: eq(variables['build.sourceBranch'], 'refs/heads/master')
+- stage: release
+  displayName: Release Binaries
+  condition: eq(variables['build.sourceBranch'], 'refs/heads/master')
+  jobs:
+  - job: release_mac
+    displayName: Release macOS
     pool:
       vmImage: 'macos-10.14'
     steps:
@@ -117,19 +132,57 @@ jobs:
       displayName: 'Download macOS Signing Certificate'
       inputs:
         secureFile: Neuron_mac.p12
+    - script: yarn release mac
+      name: Release
+      displayName: 'Sign and Release'
+      env:
+        CSC_LINK: $(macSiginingCertificate.secureFilePath)
+        CSC_KEY_PASSWORD: $(macSiginingCertificatePassword)
+        APPLE_ID: $(appleId)
+        APPLE_ID_PASSWORD: $(appleIdPassword)
+        GH_TOKEN: $(ghToken)
+
+  - job: release_linux
+    displayName: Release Linux
+    pool:
+      vmImage: 'ubuntu-18.04'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: 12.x
+      displayName: 'Install Node.js'
+    - script: |
+        yarn global add lerna
+        yarn bootstrap
+      name: Bootstrap
+    - script: yarn release linux
+      name: Release
+      displayName: 'Sign and Release'
+      env:
+        GH_TOKEN: $(ghToken)
+
+  - job: release_win
+    displayName: Release Windows
+    pool:
+      vmImage: 'macos-10.14'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: 12.x
+      displayName: 'Install Node.js'
+    - script: |
+        yarn global add lerna
+        yarn bootstrap
+      name: Bootstrap
     - task: DownloadSecureFile@1
       name: winSiginingCertificate
       displayName: 'Download Windows Signing Certificate'
       inputs:
         secureFile: Neuron_win.p12
-    - script: yarn release
+    - script: yarn release win
       name: Release
       displayName: 'Sign and Release'
       env:
-        CSC_LINK: $(macSiginingCertificate.secureFilePath)
-        CSC_KEY_PASSWORD: $(macSiginingCertificatePassword)
         WIN_CSC_LINK: $(winSiginingCertificate.secureFilePath)
         WIN_CSC_KEY_PASSWORD: $(winSiginingCertificatePassword)
-        APPLE_ID: $(appleId)
-        APPLE_ID_PASSWORD: $(appleIdPassword)
-        GH_TOKEN: $(ghToken)
+        GH_TOKEN: $(ghToken)

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.25.1",
+  "version": "0.25.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -43,7 +43,7 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.25.0-alpha.0",
+    "@nervosnetwork/ckb-sdk-core": "0.25.0",
     "@uifabric/experiments": "7.16.1",
     "@uifabric/styling": "7.6.2",
     "canvg": "2.0.0",
@@ -54,7 +54,7 @@
     "react": "16.9.0",
     "react-dom": "16.9.0",
     "react-i18next": "11.0.1",
-    "react-router-dom": "5.0.1",
+    "react-router-dom": "5.1.2",
     "react-scripts": "3.2.0",
     "styled-components": "5.0.0-beta.0"
   },
@@ -72,7 +72,7 @@
     "@types/node": "12.7.4",
     "@types/react": "16.9.2",
     "@types/react-dom": "16.9.0",
-    "@types/react-router-dom": "4.3.5",
+    "@types/react-router-dom": "5.1.3",
     "@types/storybook-react-router": "1.0.0",
     "@types/storybook__addon-knobs": "5.0.3",
     "@types/storybook__addon-storyshots": "5.1.1",