Skip to content

Commit 51f92b5

Browse files
authored
Merge pull request #1166 from nervosnetwork/rc/v0.25.2
[ᚬmaster] Rc/v0.25.2
2 parents d63b85c + 9ed6908 commit 51f92b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+858
-387
lines changed

CHANGELOG.md

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

338

azure-pipelines.yml

Lines changed: 66 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ pr:
1616
include:
1717
- '*'
1818

19-
jobs:
20-
- job: macOS
19+
stages:
20+
- stage: unit_tests
21+
displayName: Unit Tests
22+
jobs:
23+
- job: mac
24+
displayName: macOS
2125
pool:
2226
vmImage: 'macos-10.14'
2327
strategy:
@@ -37,9 +41,10 @@ jobs:
3741
- script: CI=true yarn test
3842
name: Test
3943

40-
- job: Linux
44+
- job: linux
45+
displayName: Linux
4146
pool:
42-
vmImage: 'ubuntu-16.04'
47+
vmImage: 'ubuntu-18.04'
4348
strategy:
4449
matrix:
4550
node_12_x:
@@ -60,7 +65,8 @@ jobs:
6065
CI=true yarn test
6166
name: Test
6267
63-
- job: Windows
68+
- job: win
69+
displayName: Windows
6470
pool:
6571
vmImage: 'windows-2019'
6672
strategy:
@@ -84,7 +90,12 @@ jobs:
8490
yarn test
8591
name: Test
8692
93+
- stage: e2e_tests
94+
displayName: Integration Tests
95+
dependsOn: []
96+
jobs:
8797
- job: Integration
98+
displayName: Integration Tests
8899
pool:
89100
vmImage: 'macos-10.14'
90101
steps:
@@ -99,8 +110,12 @@ jobs:
99110
- script: yarn test:e2e
100111
name: Test
101112

102-
- job: Release
103-
condition: eq(variables['build.sourceBranch'], 'refs/heads/master')
113+
- stage: release
114+
displayName: Release Binaries
115+
condition: eq(variables['build.sourceBranch'], 'refs/heads/master')
116+
jobs:
117+
- job: release_mac
118+
displayName: Release macOS
104119
pool:
105120
vmImage: 'macos-10.14'
106121
steps:
@@ -117,19 +132,57 @@ jobs:
117132
displayName: 'Download macOS Signing Certificate'
118133
inputs:
119134
secureFile: Neuron_mac.p12
135+
- script: yarn release mac
136+
name: Release
137+
displayName: 'Sign and Release'
138+
env:
139+
CSC_LINK: $(macSiginingCertificate.secureFilePath)
140+
CSC_KEY_PASSWORD: $(macSiginingCertificatePassword)
141+
APPLE_ID: $(appleId)
142+
APPLE_ID_PASSWORD: $(appleIdPassword)
143+
GH_TOKEN: $(ghToken)
144+
145+
- job: release_linux
146+
displayName: Release Linux
147+
pool:
148+
vmImage: 'ubuntu-18.04'
149+
steps:
150+
- task: NodeTool@0
151+
inputs:
152+
versionSpec: 12.x
153+
displayName: 'Install Node.js'
154+
- script: |
155+
yarn global add lerna
156+
yarn bootstrap
157+
name: Bootstrap
158+
- script: yarn release linux
159+
name: Release
160+
displayName: 'Sign and Release'
161+
env:
162+
GH_TOKEN: $(ghToken)
163+
164+
- job: release_win
165+
displayName: Release Windows
166+
pool:
167+
vmImage: 'macos-10.14'
168+
steps:
169+
- task: NodeTool@0
170+
inputs:
171+
versionSpec: 12.x
172+
displayName: 'Install Node.js'
173+
- script: |
174+
yarn global add lerna
175+
yarn bootstrap
176+
name: Bootstrap
120177
- task: DownloadSecureFile@1
121178
name: winSiginingCertificate
122179
displayName: 'Download Windows Signing Certificate'
123180
inputs:
124181
secureFile: Neuron_win.p12
125-
- script: yarn release
182+
- script: yarn release win
126183
name: Release
127184
displayName: 'Sign and Release'
128185
env:
129-
CSC_LINK: $(macSiginingCertificate.secureFilePath)
130-
CSC_KEY_PASSWORD: $(macSiginingCertificatePassword)
131186
WIN_CSC_LINK: $(winSiginingCertificate.secureFilePath)
132187
WIN_CSC_KEY_PASSWORD: $(winSiginingCertificatePassword)
133-
APPLE_ID: $(appleId)
134-
APPLE_ID_PASSWORD: $(appleIdPassword)
135-
GH_TOKEN: $(ghToken)
188+
GH_TOKEN: $(ghToken)

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.25.1",
5+
"version": "0.25.2",
66
"npmClient": "yarn",
77
"useWorkspaces": true
88
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "neuron",
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
5-
"version": "0.25.1",
5+
"version": "0.25.2",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",

packages/neuron-ui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neuron-ui",
3-
"version": "0.25.1",
3+
"version": "0.25.2",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",
@@ -43,7 +43,7 @@
4343
"last 2 chrome versions"
4444
],
4545
"dependencies": {
46-
"@nervosnetwork/ckb-sdk-core": "0.25.0-alpha.0",
46+
"@nervosnetwork/ckb-sdk-core": "0.25.0",
4747
"@uifabric/experiments": "7.16.1",
4848
"@uifabric/styling": "7.6.2",
4949
"canvg": "2.0.0",
@@ -54,7 +54,7 @@
5454
"react": "16.9.0",
5555
"react-dom": "16.9.0",
5656
"react-i18next": "11.0.1",
57-
"react-router-dom": "5.0.1",
57+
"react-router-dom": "5.1.2",
5858
"react-scripts": "3.2.0",
5959
"styled-components": "5.0.0-beta.0"
6060
},
@@ -72,7 +72,7 @@
7272
"@types/node": "12.7.4",
7373
"@types/react": "16.9.2",
7474
"@types/react-dom": "16.9.0",
75-
"@types/react-router-dom": "4.3.5",
75+
"@types/react-router-dom": "5.1.3",
7676
"@types/storybook-react-router": "1.0.0",
7777
"@types/storybook__addon-knobs": "5.0.3",
7878
"@types/storybook__addon-storyshots": "5.1.1",

0 commit comments

Comments
 (0)