From 73367a6bee848ff822fb2b74d0cd922b29deb578 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 4 Mar 2024 17:54:34 +0800 Subject: [PATCH 1/2] Use ckb-docker-builder rust-1.71.1-openssl-3.1.3 to package ckb-cli Signed-off-by: Eval EXEC --- .github/workflows/package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index d1e19429..d4b3a02e 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -68,7 +68,7 @@ jobs: name: ckb-cli_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc path: ckb-cli_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc env: - BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.51.0 + BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.71.1-openssl-3.1.3 REL_PKG: x86_64-unknown-linux-gnu.tar.gz package-for-linux-aarch64: @@ -142,7 +142,7 @@ jobs: name: ckb-cli_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc path: ckb-cli_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc env: - BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.51.0 + BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.71.1-openssl-3.1.3 REL_PKG: x86_64-unknown-centos-gnu.tar.gz package-for-mac: From 48c1b82aa385c27f3ad629a9bb50d7b0a68fc1b5 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 4 Mar 2024 21:05:54 +0800 Subject: [PATCH 2/2] Setup github rust action --- .github/workflows/ci.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ceb38674..f1ba2e15 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,6 +21,9 @@ jobs: os: [ ubuntu-latest, macos-11, windows-latest ] steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.71.1 - if: matrix.os == 'windows-latest' name: Windows Dependencies shell: pwsh @@ -40,6 +43,9 @@ jobs: os: [ ubuntu-latest, macos-11 ] steps: - uses: actions/checkout@v2 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.71.1 - name: Integration_Test run: make integration @@ -50,6 +56,9 @@ jobs: os: [ ubuntu-latest, macos-11 ] steps: - uses: actions/checkout@v2 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.71.1 - name: Linters run: | cargo fmt --version || rustup component add rustfmt @@ -68,6 +77,9 @@ jobs: - --hide-inclusion-graph --show-stats licenses steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.71.1 - uses: EmbarkStudios/cargo-deny-action@v1 with: command: check ${{ matrix.checks }}