Skip to content

Commit

Permalink
Merge branch 'develop' into fix-288
Browse files Browse the repository at this point in the history
  • Loading branch information
devchenyan authored Dec 22, 2023
2 parents 12dccc8 + 432f0ec commit 9a6a3de
Show file tree
Hide file tree
Showing 53 changed files with 2,901 additions and 1,771 deletions.
2 changes: 1 addition & 1 deletion .ckb-light-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.2
v0.3.3
6 changes: 3 additions & 3 deletions .github/workflows/add-replied-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- id: check-access
name: Check if the commenter is a collaborator
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
try{
Expand All @@ -30,7 +30,7 @@ jobs:

- id: check-issue
name: Check if the comment is replied in an issue
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const response = await github.rest.issues.get({
Expand All @@ -45,7 +45,7 @@ jobs:
- id: add-label
name: Add 'replied' label
if: ${{ steps.check-access.outputs.result == 'true' && steps.check-issue.outputs.result == 'true' }}
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
await github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: "yarn"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-spell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ jobs:
name: Check spell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: crate-ci/typos@master
2 changes: 1 addition & 1 deletion .github/workflows/check_checksums.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Generate checksums from artifacts
run:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/checksums-of-release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
if: github.event.workflow_run.conclusion == 'success'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 'latest'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down Expand Up @@ -132,42 +132,42 @@ jobs:

- name: Upload Neuron App Zip
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Mac
path: release/Neuron-*-mac-x64.zip

- name: Upload Neuron App Zip(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Mac
path: release/Neuron-*-mac-arm64.zip

- name: Upload Neuron Dmg
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Dmg
path: release/Neuron-*-x64.dmg

- name: Upload Neuron Dmg(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Dmg
path: release/Neuron-*-arm64.dmg

- name: Upload Neuron Win
if: matrix.os == 'windows-2019'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Win
path: release/Neuron-*-setup.exe

- name: Upload Neuron Linux
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Linux
path: release/Neuron-*.AppImage
20 changes: 10 additions & 10 deletions .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ jobs:
git config --global core.eol lf
- name: Checkout for push
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ github.event_name == 'push' }}

- name: Checkout for PR
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ github.event_name == 'issue_comment' }}
with:
ref: refs/pull/${{ github.event.issue.number }}/merge

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
CI: false

- name: Write electron-build Test yml
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const fs = require('node:fs')
Expand Down Expand Up @@ -164,42 +164,42 @@ jobs:

- name: Upload Neuron App Zip
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Mac-x64
path: release/Neuron-*-mac-x64.zip

- name: Upload Neuron App Zip(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Mac-arm64
path: release/Neuron-*-mac-arm64.zip

- name: Upload Neuron Dmg
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Dmg-x64
path: release/Neuron-*-x64.dmg

- name: Upload Neuron Dmg(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Dmg-arm64
path: release/Neuron-*-arm64.dmg

- name: Upload Neuron Win
if: matrix.os == 'windows-2019'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Win
path: release/Neuron-*-setup.exe

- name: Upload Neuron Linux
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Neuron-Linux
path: release/Neuron-*.AppImage
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-issue-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Update stale issues
uses: actions/stale@v8
uses: actions/stale@v9
with:
any-of-issue-labels: replied
stale-issue-label: stale
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update_ckb_client_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -28,7 +28,7 @@ jobs:
git add .ckb-version .ckb-light-version compatible.json
- name: Set GPG
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update_neuron_compatible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.x

Expand All @@ -31,7 +31,7 @@ jobs:
git add compatible.json
- name: Set GPG
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/update_valid_target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:
if: ${{ startsWith(github.ref_name, 'rc/') }}
steps:
- name: Create Branch
uses: peterjgrainger/action-create-branch@v2.2.0
uses: peterjgrainger/action-create-branch@v2.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: 'chore-update-valid-target/${{github.ref_name}}'
sha: '${{ github.event.create.head.sha }}'

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'chore-update-valid-target/${{github.ref_name}}'

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.12.0

Expand All @@ -32,7 +32,7 @@ jobs:
npm run update:valid-target
- name: Commit env file
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE: ${{ github.ref_name }}
Expand All @@ -59,7 +59,7 @@ jobs:
})
- name: Create PR
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE: ${{github.ref}}
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"scripts": {
"start:ui": "cd packages/neuron-ui && yarn run start",
"start:wallet": "cd packages/neuron-wallet && yarn run start:debug",
"start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://127.0.0.1:3000 && yarn run start:wallet\"",
"start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on -t 10000 http://127.0.0.1:3000 && yarn run start:wallet\"",
"clean": "lerna run --stream clean",
"prebuild": "yarn clean",
"build": "lerna run --stream build",
Expand All @@ -41,15 +41,15 @@
"update:client-versions": "node ./scripts/update-ckb-client-versions.js"
},
"devDependencies": {
"@babel/core": "7.23.5",
"@babel/core": "7.23.6",
"@types/jest": "27.5.2",
"@types/node": "18.16.18",
"@types/node": "18.19.3",
"@types/npmlog": "4.1.6",
"@typescript-eslint/eslint-plugin": "5.60.1",
"@typescript-eslint/parser": "5.60.1",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"eslint": "8.54.0",
"eslint": "8.56.0",
"eslint-config-prettier": "8.10.0",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
Expand All @@ -63,10 +63,10 @@
},
"dependencies": {},
"resolutions": {
"@types/react": "17.0.71",
"@types/react": "18.2.45",
"react-i18next": ">=11.16.4"
},
"volta": {
"node": "18.16.1"
"node": "18.19.0"
}
}
Loading

1 comment on commit 9a6a3de

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packaging for test is done in 7302038371

Please sign in to comment.