Merge branch 'master' into develop

nervosnetwork · Dec 21, 2022 · 4fc59fc · 4fc59fc · github-actions · Dec 21, 2022
2 parents b0aa8bf + 454ba8f
commit 4fc59fc
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -14,7 +14,7 @@ jobs:
         node:
           - 18.12.0
         os:
-          - macos-latest
+          - macos-11
           - ubuntu-20.04
           - windows-2019
 
@@ -43,7 +43,7 @@ jobs:
           path: |
             node_modules
             */*/node_modules
-          key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
+          key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
       - name: Add msbuild to PATH
         if: matrix.os == 'windows-2019'
@@ -67,7 +67,7 @@ jobs:
           CI: false
 
       - name: Package for MacOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         run: |
           ./scripts/download-ckb.sh mac
           yarn release mac
@@ -99,7 +99,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Neuron App Zip
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Mac
@@ -113,7 +113,7 @@ jobs:
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Dmg

diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
@@ -9,7 +9,7 @@ jobs:
         node:
           - 18.12.0
         os:
-          - macos-latest
+          - macos-11
           - ubuntu-20.04
           - windows-2019
 
@@ -38,7 +38,7 @@ jobs:
           path: |
             node_modules
             */*/node_modules
-          key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
+          key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
       - name: Add msbuild to PATH
         if: matrix.os == 'windows-2019'
@@ -62,7 +62,7 @@ jobs:
           CI: false
 
       - name: Package for MacOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         run: |
           ./scripts/download-ckb.sh mac
           yarn package:test mac
@@ -94,7 +94,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Neuron App Zip
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Mac
@@ -108,7 +108,7 @@ jobs:
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Dmg

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 0.103.3 (2022-12-21)
+
+### Certificate
+
+We've updated the certificate of Neuron for windows, which is issued by **DigiCert** and distributed to [Magickbase](https://github.com/Magickbase/), the active developer team of Neuron. With this update, a warning may appear on updating Neuron by `check for update` inside Neuron, please don't worry and download Neuron from [GitHub Release](https://github.com/nervosnetwork/neuron/releases) to adopt the new certificate.
+
+### Bug Fixes
+
+* #2551: Fix sending multisig tx when input cell's length is greater than 1.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.103.2...v0.103.3
+
+
+
 # 0.103.2 (2022-07-09)
 
 ### New features

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.103.2",
+  "version": "0.103.3",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.103.2",
+  "version": "0.103.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

diff --git 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.103.2",
+  "version": "0.103.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -91,7 +91,7 @@
     "eslint-plugin-prettier": "3.4.1",
     "jest-when": "2.8.1",
     "lint-staged": "9.5.0",
-    "neuron-ui": "0.103.2",
+    "neuron-ui": "0.103.3",
     "prettier": "1.19.1",
     "ttypescript": "1.5.13",
     "typescript": "4.2.3"