1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-07 23:00:01 +02:00

Update Rust toolchain version in CI workflows and add .rust-toolchain file

This commit is contained in:
mr. M 2025-03-29 23:40:37 +01:00
parent 41752dcac5
commit 7dc45bb438
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
5 changed files with 6 additions and 5 deletions

View file

@ -91,7 +91,7 @@ jobs:
- name: Fix Rust version - name: Fix Rust version
run: | run: |
# Install a rust version compatible with LLVM 18 # Install a rust version compatible with LLVM 18
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
source $HOME/.cargo/env source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then if test "${{ matrix.arch }}" = "aarch64"; then

View file

@ -82,7 +82,7 @@ jobs:
brew install watchman brew install watchman
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
source $HOME/.cargo/env source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then if test "${{ matrix.arch }}" = "aarch64"; then

View file

@ -176,14 +176,14 @@ jobs:
- name: Setup Rust - name: Setup Rust
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }} if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
run: | run: |
cd engine/ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81
source $HOME/.cargo/env source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then if test "${{ matrix.arch }}" = "aarch64"; then
rustup target add aarch64-pc-windows-msvc rustup target add aarch64-pc-windows-msvc
else else
rustup target add x86_64-pc-windows-msvc rustup target add x86_64-pc-windows-msvc
fi fi
cd engine/
cargo install cargo-download --locked cargo install cargo-download --locked
cargo download -x windows=0.58.0 cargo download -x windows=0.58.0
export CARGO_INCREMENTAL=0 export CARGO_INCREMENTAL=0

1
.rust-toolchain Normal file
View file

@ -0,0 +1 @@
1.82

2
l10n

@ -1 +1 @@
Subproject commit 778cb128c659c7b8f57080e99fbc04f8d93c30a2 Subproject commit 4094426d24cf3e131b5a07775478ed893112e9da