From 508c848e2a7a225aa44e05a52617b7658cd6b82a Mon Sep 17 00:00:00 2001 From: Keith Date: Fri, 13 Aug 2021 11:49:36 +0800 Subject: [PATCH 1/3] ci: update github action of packaging 1. triggered on push event of master, rc/** 2. triggered on pr merge event of master, rc/** 3. not triggered on pr open event of master, rc/** --- .github/workflows/package.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 45b7860aca..a932983b1f 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -2,13 +2,10 @@ name: Package Neuron on: push: - branches: - - "hotfix/**" - - pull_request: branches: - master - "rc/**" + - "hotfix/**" jobs: default: From 4fd9bf8b3ed2f5bff75b2b6ffd310230c74fe23d Mon Sep 17 00:00:00 2001 From: Keith Date: Thu, 19 Aug 2021 14:23:37 +0800 Subject: [PATCH 2/3] ci: disable package action on GitHub --- .github/workflows/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 45b7860aca..09c1622191 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,6 +12,7 @@ on: jobs: default: + if: false strategy: matrix: node: From a48d2196c0d8dddf9eda575e9fc5811ef862fd77 Mon Sep 17 00:00:00 2001 From: kellyshang Date: Mon, 30 Aug 2021 14:53:46 +0800 Subject: [PATCH 3/3] chore: bump version to v0.36.0 and update CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ lerna.json | 2 +- package.json | 2 +- packages/neuron-ui/package.json | 2 +- packages/neuron-wallet/package.json | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 312cb453a7..392b692ac9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 0.36.0 (2021-08-30) + +[CKB v0.35.2](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.2) was released on Feb. 23rd, 2021. This version of CKB node is now bundled and preconfigured in Neuron. + +### New feature +* Support sending and receiving NFT in the `Customized Assets`. + +### Bug fixes + +* Upgrade the bundled CKB node to v0.35.2. +* Add hint for `Token ID` field when creating a new sUDT account. + + # 0.36.0-rc2 (2021-08-23) This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions. diff --git a/lerna.json b/lerna.json index 85fb048855..87b6bd03c0 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.36.0-rc2", + "version": "0.36.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 2b9def017f..44dd43a719 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "neuron", "productName": "Neuron", "description": "CKB Neuron Wallet", - "version": "0.36.0-rc2", + "version": "0.36.0", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index bb9dd7f086..7d3527ae90 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -1,6 +1,6 @@ { "name": "neuron-ui", - "version": "0.36.0-rc2", + "version": "0.36.0", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 09c38aa67d..53cca20a12 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -3,7 +3,7 @@ "productName": "Neuron", "description": "CKB Neuron Wallet", "homepage": "https://www.nervos.org/", - "version": "0.36.0-rc2", + "version": "0.36.0", "private": true, "author": { "name": "Nervos Core Dev", @@ -84,7 +84,7 @@ "electron-notarize": "0.2.1", "jest-when": "2.7.2", "lint-staged": "9.2.5", - "neuron-ui": "0.36.0-rc2", + "neuron-ui": "0.36.0", "rimraf": "3.0.0", "ttypescript": "1.5.10" }