Skip to content

Commit 58866e3

Browse files
zhangsoledadzhangsoledad
authored
Merge branch 'develop' into exec/note-consensus-rpc-multisig
2 parents cbd37c7 + 6a6a8c2 commit 58866e3

File tree

287 files changed

+8552
-5246
lines changed

Some content is hidden

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

287 files changed

+8552
-5246
lines changed

‎.github/workflows/ci_aarch64_build_ubuntu.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
job_skip: ${{ steps.prologue.outputs.job_skip }}
2626
linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }}
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- name: prologue
3030
id: prologue
3131
uses: ./.github/actions/ci_prologue
@@ -42,12 +42,11 @@ jobs:
4242
needs: prologue
4343
runs-on: ${{ needs.prologue.outputs.linux_runner_label }}
4444
steps:
45-
- uses: actions-rs/toolchain@v1
45+
- uses: actions/checkout@v4
46+
- uses: dtolnay/rust-toolchain@master
4647
with:
47-
profile: minimal
4848
toolchain: 1.85.0
49-
- uses: actions/checkout@v3
50-
- run: rustup component add rustfmt
49+
components: rustfmt
5150
- run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y && sudo apt-get install -y gcc-multilib
5251
- name: ci_aarch64_build_ubuntu
5352
run: |

‎.github/workflows/ci_benchmarks_macos.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
job_skip: ${{ steps.prologue.outputs.job_skip }}
3434
runner_label: ${{ steps.prologue.outputs.runner_label }}
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: prologue
3838
id: prologue
3939
uses: ./.github/actions/ci_prologue
@@ -50,7 +50,7 @@ jobs:
5050
needs: prologue
5151
runs-on: macos-13
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454
- run: |
5555
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
5656
devtools/ci/ci_main.sh

‎.github/workflows/ci_benchmarks_ubuntu.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
job_skip: ${{ steps.prologue.outputs.job_skip }}
3333
linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }}
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: prologue
3737
id: prologue
3838
uses: ./.github/actions/ci_prologue
@@ -49,14 +49,12 @@ jobs:
4949
needs: prologue
5050
runs-on: ${{ needs.prologue.outputs.linux_runner_label }}
5151
steps:
52-
- uses: actions-rs/toolchain@v1
52+
- uses: dtolnay/rust-toolchain@master
5353
with:
54-
profile: minimal
5554
toolchain: 1.85.0
56-
- run: rustup component add rustfmt
57-
- run: rustup component add clippy
55+
components: rustfmt, clippy
5856
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
59-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
6058
- run: |
6159
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
6260
devtools/ci/ci_main.sh

‎.github/workflows/ci_benchmarks_windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
job_skip: ${{ steps.prologue.outputs.job_skip }}
3434
windows_runner_label: ${{ steps.prologue.outputs.windows_runner_label }}
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: prologue
3838
id: prologue
3939
uses: ./.github/actions/ci_prologue
@@ -50,7 +50,7 @@ jobs:
5050
needs: prologue
5151
runs-on: ${{ needs.prologue.outputs.windows_runner_label }}
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454
- name: install required tools
5555
if: ${{ needs.prologue.outputs.windows_runner_label == 'windows-2019' }}
5656
run: |

‎.github/workflows/ci_cargo_deny_ubuntu.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
job_skip: ${{ steps.prologue.outputs.job_skip }}
3434
linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }}
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: prologue
3838
id: prologue
3939
uses: ./.github/actions/ci_prologue
@@ -50,7 +50,7 @@ jobs:
5050
needs: prologue
5151
runs-on: ubuntu-22.04
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454
- name: ci_cargo_deny_ubuntu
5555
run: |
5656
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then

‎.github/workflows/ci_integration_tests_macos.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
job_skip: ${{ steps.prologue.outputs.job_skip }}
3636
runner_label: ${{ steps.prologue.outputs.runner_label }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939
- name: prologue
4040
id: prologue
4141
uses: ./.github/actions/ci_prologue
@@ -53,7 +53,7 @@ jobs:
5353
timeout-minutes: 140
5454
runs-on: macos-13
5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757
- run: |
5858
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
5959
devtools/ci/ci_main.sh

‎.github/workflows/ci_integration_tests_ubuntu.yaml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
job_skip: ${{ steps.prologue.outputs.job_skip }}
3737
linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }}
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- name: prologue
4141
id: prologue
4242
uses: ./.github/actions/ci_prologue
@@ -54,14 +54,12 @@ jobs:
5454
timeout-minutes: 140
5555
runs-on: ${{ needs.prologue.outputs.linux_runner_label }}
5656
steps:
57-
- uses: actions-rs/toolchain@v1
57+
- uses: dtolnay/rust-toolchain@master
5858
with:
59-
profile: minimal
6059
toolchain: 1.85.0
61-
- run: rustup component add rustfmt
62-
- run: rustup component add clippy
60+
components: rustfmt, clippy
6361
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
64-
- uses: actions/checkout@v3
62+
- uses: actions/checkout@v4
6563
- run: |
6664
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
6765
devtools/ci/ci_main.sh
@@ -83,14 +81,12 @@ jobs:
8381
needs: prologue
8482
runs-on: ${{ needs.prologue.outputs.linux_runner_label }}
8583
steps:
86-
- uses: actions-rs/toolchain@v1
84+
- uses: dtolnay/rust-toolchain@master
8785
with:
88-
profile: minimal
8986
toolchain: 1.85.0
90-
- run: rustup component add rustfmt
91-
- run: rustup component add clippy
87+
components: rustfmt, clippy
9288
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
93-
- uses: actions/checkout@v3
89+
- uses: actions/checkout@v4
9490
- name: build ckb and run bats cli test
9591
run: |
9692
make prod

‎.github/workflows/ci_integration_tests_windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
job_skip: ${{ steps.prologue.outputs.job_skip }}
3737
windows_runner_label: ${{ steps.prologue.outputs.windows_runner_label }}
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- name: prologue
4141
id: prologue
4242
uses: ./.github/actions/ci_prologue
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: windows-latest
5555
timeout-minutes: 140
5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
- name: install required tools
5959
if: ${{ needs.prologue.outputs.windows_runner_label == 'windows-2019' }}
6060
run: |

‎.github/workflows/ci_linters_macos.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
job_skip: ${{ steps.prologue.outputs.job_skip }}
3434
runner_label: ${{ steps.prologue.outputs.runner_label }}
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: prologue
3838
id: prologue
3939
uses: ./.github/actions/ci_prologue
@@ -50,7 +50,7 @@ jobs:
5050
needs: prologue
5151
runs-on: macos-13
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454
- run: |
5555
brew install grep gnu-sed
5656
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then

‎.github/workflows/ci_linters_ubuntu.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
job_skip: ${{ steps.prologue.outputs.job_skip }}
3434
linux_runner_label: ${{ steps.prologue.outputs.linux_runner_label }}
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: prologue
3838
id: prologue
3939
uses: ./.github/actions/ci_prologue
@@ -50,14 +50,12 @@ jobs:
5050
needs: prologue
5151
runs-on: ${{ needs.prologue.outputs.linux_runner_label }}
5252
steps:
53-
- uses: actions-rs/toolchain@v1
53+
- uses: actions/checkout@v4
54+
- uses: dtolnay/rust-toolchain@master
5455
with:
55-
profile: minimal
5656
toolchain: 1.85.0
57-
- uses: actions/checkout@v3
58-
- run: rustup component add rustfmt
57+
components: rustfmt, clippy
5958
- run: cargo fmt --all -- --check
60-
- run: rustup component add clippy
6159
- run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y
6260
- run: |
6361
if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then

0 commit comments

Comments
 (0)