From 25cc97660a7f2ff73d7ae716e0de4c1e905b9e70 Mon Sep 17 00:00:00 2001 From: einliterflasche Date: Thu, 27 Feb 2025 18:52:28 +0100 Subject: [PATCH] fix(ci): update our ci toolchain to resolve toolchain conflicts --- .github/workflows/build-gui-release-binaries-cb.yml | 6 ++---- .github/workflows/build-gui-release-binaries.yml | 6 ++---- .github/workflows/build-release-binaries.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/draft-new-release.yml | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-gui-release-binaries-cb.yml b/.github/workflows/build-gui-release-binaries-cb.yml index e987bcb1..49c0aabd 100644 --- a/.github/workflows/build-gui-release-binaries-cb.yml +++ b/.github/workflows/build-gui-release-binaries-cb.yml @@ -52,7 +52,7 @@ jobs: - uses: Swatinem/rust-cache@v2.7.3 - name: Install Rust Stable - uses: dtolnay/rust-toolchain@1.79 + uses: dtolnay/rust-toolchain@1.80 with: targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} @@ -81,9 +81,7 @@ jobs: - name: Work around spurious network errors in curl 8.0 shell: bash run: | - if rustc --version --verbose | grep -q '^release: 1\.79\.'; then - echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV - fi + echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV - name: Install Frontend Dependencies working-directory: src-gui diff --git a/.github/workflows/build-gui-release-binaries.yml b/.github/workflows/build-gui-release-binaries.yml index bd9f10cb..2a6a743f 100644 --- a/.github/workflows/build-gui-release-binaries.yml +++ b/.github/workflows/build-gui-release-binaries.yml @@ -37,7 +37,7 @@ jobs: - uses: Swatinem/rust-cache@v2.7.3 - name: install Rust stable - uses: dtolnay/rust-toolchain@1.79 + uses: dtolnay/rust-toolchain@1.80 with: # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} @@ -67,9 +67,7 @@ jobs: - name: work around spurious network errors in curl 8.0 shell: bash run: | - if rustc --version --verbose | grep -q '^release: 1\.79\.'; then - echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV - fi + echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV - name: install frontend dependencies working-directory: src-gui diff --git a/.github/workflows/build-release-binaries.yml b/.github/workflows/build-release-binaries.yml index 0d376490..d7a126fe 100644 --- a/.github/workflows/build-release-binaries.yml +++ b/.github/workflows/build-release-binaries.yml @@ -66,7 +66,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: "1.74" + toolchain: "1.80" - name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary if: matrix.target == 'armv7-unknown-linux-gnueabihf' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56a92b2e..5384746b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: "1.74" + toolchain: "1.80" components: clippy,rustfmt - uses: Swatinem/rust-cache@v2.7.3 @@ -123,7 +123,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: - toolchain: "1.74" + toolchain: "1.80" targets: armv7-unknown-linux-gnueabihf - name: Install dependencies required by Tauri v2 (ubuntu only) diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml index fbcaddd5..cc7e32cf 100644 --- a/.github/workflows/draft-new-release.yml +++ b/.github/workflows/draft-new-release.yml @@ -53,7 +53,7 @@ jobs: id: make-commit env: DPRINT_VERSION: "0.39.1" - RUST_TOOLCHAIN: "1.79" + RUST_TOOLCHAIN: "1.80" run: | rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu" curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION