Skip to content

Commit 25cc976

Browse files
fix(ci): update our ci toolchain to resolve toolchain conflicts
1 parent bee547e commit 25cc976

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

.github/workflows/build-gui-release-binaries-cb.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- uses: Swatinem/rust-cache@v2.7.3
5353

5454
- name: Install Rust Stable
55-
uses: dtolnay/rust-toolchain@1.79
55+
uses: dtolnay/rust-toolchain@1.80
5656
with:
5757
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
5858

@@ -81,9 +81,7 @@ jobs:
8181
- name: Work around spurious network errors in curl 8.0
8282
shell: bash
8383
run: |
84-
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then
85-
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
86-
fi
84+
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
8785
8886
- name: Install Frontend Dependencies
8987
working-directory: src-gui

.github/workflows/build-gui-release-binaries.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: Swatinem/rust-cache@v2.7.3
3838

3939
- name: install Rust stable
40-
uses: dtolnay/rust-toolchain@1.79
40+
uses: dtolnay/rust-toolchain@1.80
4141
with:
4242
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
4343
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
@@ -67,9 +67,7 @@ jobs:
6767
- name: work around spurious network errors in curl 8.0
6868
shell: bash
6969
run: |
70-
if rustc --version --verbose | grep -q '^release: 1\.79\.'; then
71-
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
72-
fi
70+
echo "CARGO_HTTP_MULTIPLEXING=false" >> $GITHUB_ENV
7371
7472
- name: install frontend dependencies
7573
working-directory: src-gui

.github/workflows/build-release-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666

6767
- uses: dtolnay/rust-toolchain@master
6868
with:
69-
toolchain: "1.74"
69+
toolchain: "1.80"
7070

7171
- name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary
7272
if: matrix.target == 'armv7-unknown-linux-gnueabihf'

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- uses: dtolnay/rust-toolchain@master
1717
with:
18-
toolchain: "1.74"
18+
toolchain: "1.80"
1919
components: clippy,rustfmt
2020

2121
- uses: Swatinem/rust-cache@v2.7.3
@@ -123,7 +123,7 @@ jobs:
123123

124124
- uses: dtolnay/rust-toolchain@master
125125
with:
126-
toolchain: "1.74"
126+
toolchain: "1.80"
127127
targets: armv7-unknown-linux-gnueabihf
128128

129129
- name: Install dependencies required by Tauri v2 (ubuntu only)

.github/workflows/draft-new-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
id: make-commit
5454
env:
5555
DPRINT_VERSION: "0.39.1"
56-
RUST_TOOLCHAIN: "1.79"
56+
RUST_TOOLCHAIN: "1.80"
5757
run: |
5858
rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu"
5959
curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION

0 commit comments

Comments
 (0)