Skip to content

Commit

Permalink
Merge pull request #586 from eval-exec/exec/package-use-rust-toolchai…
Browse files Browse the repository at this point in the history
…n-1.71.1

Use ckb-docker-builder `rust-1.71.1-openssl-3.1.3` to package ckb-cli
  • Loading branch information
doitian authored Mar 5, 2024
2 parents 0fd7ad5 + 48c1b82 commit 149cd50
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 149cd50

Please sign in to comment.