From 349aa564eb261133d769718853a3305f08866cd6 Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:57:40 +0200 Subject: [PATCH 1/2] ci: use rust toolchain v1.71.0 --- .github/workflows/ci.yaml | 16 ++++++++-------- rust-toolchain | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d435c9bd5..e4efeb5c4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,16 +6,16 @@ on: - develop - rc/next paths-ignore: - - '**/CHANGELOG.md' - - 'docs/**' + - "**/CHANGELOG.md" + - "docs/**" push: branches: - main - develop - rc/next paths-ignore: - - '**/CHANGELOG.md' - - 'docs/**' + - "**/CHANGELOG.md" + - "docs/**" workflow_dispatch: @@ -77,7 +77,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.71.0 profile: minimal components: rustfmt override: true @@ -221,7 +221,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.71.0 target: ${{ matrix.target }} profile: minimal components: llvm-tools-preview @@ -410,7 +410,7 @@ jobs: if: github.event_name != 'pull_request' || matrix.target == 'x86_64-unknown-linux-gnu' uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.71.0 target: ${{ matrix.target }} profile: minimal components: llvm-tools-preview @@ -522,7 +522,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.71.0 target: x86_64-unknown-linux-gnu profile: minimal components: llvm-tools-preview diff --git a/rust-toolchain b/rust-toolchain index 22048ac5b..aa464261d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,2 +1,2 @@ [toolchain] -channel = "1.70.0" +channel = "1.71.0" From 557d88497d1324757821fe86833940bf8fb27e23 Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:13:05 +0200 Subject: [PATCH 2/2] ci: use rust toolchain v1.71.0 in docker images --- dockerfiles/components/clarinet-dev.dockerfile | 2 +- dockerfiles/components/clarinet.dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dockerfiles/components/clarinet-dev.dockerfile b/dockerfiles/components/clarinet-dev.dockerfile index d8deca674..3566b856c 100644 --- a/dockerfiles/components/clarinet-dev.dockerfile +++ b/dockerfiles/components/clarinet-dev.dockerfile @@ -4,7 +4,7 @@ WORKDIR /src RUN apt update && apt install -y ca-certificates pkg-config libssl-dev -RUN rustup update 1.67.0 && rustup default 1.67.0 +RUN rustup update 1.71.0 && rustup default 1.71.0 COPY . . diff --git a/dockerfiles/components/clarinet.dockerfile b/dockerfiles/components/clarinet.dockerfile index 5aa2f85e4..4585bc0fe 100644 --- a/dockerfiles/components/clarinet.dockerfile +++ b/dockerfiles/components/clarinet.dockerfile @@ -2,6 +2,8 @@ FROM debian:bookworm-slim RUN apt update && apt install -y libssl-dev +RUN rustup update 1.71.0 && rustup default 1.71.0 + COPY clarinet /bin/ WORKDIR /workspace