Skip to content

Commit b146f8c

Browse files
kellyshangkellyshang
authored
Merge pull request #2062 from nervosnetwork/develop
Merge develop into 0.36.0-rc1
2 parents 4cfc6b4 + 3b36537 commit b146f8c

File tree

12 files changed

+365
-167
lines changed

12 files changed

+365
-167
lines changed

‎.github/workflows/merge_released_into_develop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
source_branch: 'master'
1818
destination_branch: 'develop'
1919
pr_title: 'Merge released ${{ github.ref }} into develop'
20-
pr_reviewer: 'keith-cy,katat,yuche,kellyshang'
20+
pr_reviewer: 'keith-cy,yuche,kellyshang'
2121
pr_label: 'auto-pr'
2222
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/package.yml‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: Package Neuron
2+
3+
on:
4+
push:
5+
branches:
6+
- "hotfix/**"
7+
8+
pull_request:
9+
branches:
10+
- master
11+
- "rc/**"
12+
13+
jobs:
14+
default:
15+
strategy:
16+
matrix:
17+
node:
18+
- 12
19+
os:
20+
- macos-latest
21+
- ubuntu-18.04
22+
- windows-2019
23+
24+
runs-on: ${{ matrix.os }}
25+
26+
name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
27+
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v2
31+
32+
- name: Setup Node
33+
uses: actions/setup-node@v2
34+
with:
35+
node-version: ${{ matrix.node }}
36+
cache: "yarn"
37+
38+
- name: Restore
39+
uses: actions/cache@v2
40+
with:
41+
path: |
42+
node_modules
43+
*/*/node_modules
44+
key: 2021-8-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
45+
46+
- name: Add msbuild to PATH
47+
if: matrix.os == 'windows-2019'
48+
uses: microsoft/setup-msbuild@v1.0.2
49+
env:
50+
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
51+
52+
- name: Install Lerna
53+
run: yarn global add lerna
54+
55+
- name: Boostrap
56+
run: |
57+
yarn bootstrap
58+
env:
59+
CI: false
60+
61+
- name: Import Code-Signing Certificates
62+
if: matrix.os == 'macos-latest'
63+
uses: Apple-Actions/import-codesign-certs@v1
64+
with:
65+
p12-file-base64: ${{ secrets.MAC_CERTIFICATE_BASE64 }}
66+
p12-password: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
67+
68+
- name: Package for MacOS
69+
if: matrix.os == 'macos-latest'
70+
run: |
71+
./scripts/download-ckb.sh mac
72+
yarn release mac
73+
env:
74+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
CSC_LINK: ${{ secrets.MAC_CERTIFICATE_BASE64 }}
76+
CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
77+
78+
- name: Package for Windows
79+
if: matrix.os == 'windows-2019'
80+
run: |
81+
bash ./scripts/download-ckb.sh win
82+
yarn build
83+
bash ./scripts/copy-ui-files.sh
84+
bash ./scripts/release.sh win
85+
env:
86+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
# CSC_LINK: ${{ secrets.MAC_CERTIFICATE_BASE64 }}
88+
# CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
89+
90+
- name: Package for Linux
91+
if: matrix.os == 'ubuntu-18.04'
92+
run: |
93+
./scripts/download-ckb.sh
94+
yarn release linux
95+
env:
96+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
98+
- name: Upload Neuron App Zip
99+
if: matrix.os == 'macos-latest'
100+
uses: actions/upload-artifact@v2
101+
with:
102+
name: Neuron-Mac
103+
path: release/Neuron-*-mac.zip
104+
105+
- name: Upload Neuron Dmg
106+
if: matrix.os == 'macos-latest'
107+
uses: actions/upload-artifact@v2
108+
with:
109+
name: Neuron-Dmg
110+
path: release/Neuron-*.dmg
111+
112+
- name: Upload Neuron Win
113+
if: matrix.os == 'windows-2019'
114+
uses: actions/upload-artifact@v2
115+
with:
116+
name: Neuron-Win
117+
path: release/Neuron-*-setup.exe
118+
119+
- name: Upload Neuron Linux
120+
if: matrix.os == 'ubuntu-18.04'
121+
uses: actions/upload-artifact@v2
122+
with:
123+
name: Neuron-Linux
124+
path: release/Neuron-*.AppImage

‎.github/workflows/unit_tests.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Unit Tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
default:
9+
strategy:
10+
matrix:
11+
node:
12+
- 12
13+
os:
14+
- macos-latest
15+
- ubuntu-18.04
16+
- windows-latest
17+
18+
runs-on: ${{ matrix.os }}
19+
20+
name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
21+
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v2
25+
26+
- name: Setup Node
27+
uses: actions/setup-node@v2
28+
with:
29+
node-version: ${{ matrix.node }}
30+
cache: "yarn"
31+
32+
- name: Restore
33+
uses: actions/cache@v2
34+
with:
35+
path: |
36+
node_modules
37+
*/*/node_modules
38+
key: 2021-8-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
39+
40+
- name: Install Lerna
41+
run: yarn global add lerna
42+
43+
- name: Boostrap
44+
run: |
45+
yarn bootstrap
46+
yarn build
47+
env:
48+
CI: false
49+
50+
- name: Unit Tests
51+
run: yarn test
52+
env:
53+
CI: true

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 0.36.0-rc1 (2021-07-16)
1+
# 0.36.0-rc1 (2021-08-10)
22

33
This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
44

@@ -12,6 +12,14 @@ This is a release candidate to preview the changes in the next official release
1212
* Upgrade the bundled CKB node to v0.35.2.
1313
* Add hint for `Token ID` field when creating a new sUDT account.
1414

15+
# 0.35.1 (2021-08-10)
16+
17+
[CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1) was released on Sept. 14th, 2020. This version of CKB node is now bundled and preconfigured in Neuron.
18+
19+
### Hot fix
20+
21+
* Disable timelock for hardware wallet transfer.
22+
1523
# 0.35.0 (2021-01-12)
1624

1725
[CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1) was released on Sept. 14th, 2020. This version of CKB node is now bundled and preconfigured in Neuron.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Nervos CKB Desktop Wallet
44

55
[![Azure Pipelines Build Status](https://dev.azure.com/nervosnetwork/neuron/_apis/build/status/nervosnetwork.neuron?branchName=develop)](https://dev.azure.com/nervosnetwork/neuron/_build/latest?definitionId=8&branchName=develop)
6+
[![Unit Tests](https://github.com/nervosnetwork/neuron/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/nervosnetwork/neuron/actions/workflows/unit_tests.yml)
67
[![Telegram Group](https://cdn.rawgit.com/Patrolavia/telegram-badge/8fe3382b/chat.svg)](https://t.me/nervos_ckb_dev)
78

89
---

0 commit comments

Comments
 (0)