From 7dc45bb438afb2d3cff12c33d15f27707d7feb0c Mon Sep 17 00:00:00 2001 From: "mr. M" Date: Sat, 29 Mar 2025 23:40:37 +0100 Subject: [PATCH] Update Rust toolchain version in CI workflows and add .rust-toolchain file --- .github/workflows/linux-release-build.yml | 2 +- .github/workflows/macos-release-build.yml | 2 +- .github/workflows/windows-release-build.yml | 4 ++-- .rust-toolchain | 1 + l10n | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .rust-toolchain diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 6de6c58d..a56a81d7 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -91,7 +91,7 @@ jobs: - name: Fix Rust version run: | # 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 if test "${{ matrix.arch }}" = "aarch64"; then diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 13c9b0d1..838c9a3e 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -82,7 +82,7 @@ jobs: 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 if test "${{ matrix.arch }}" = "aarch64"; then diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 602e397a..5cf53126 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -176,14 +176,14 @@ jobs: - name: Setup Rust if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }} run: | - cd engine/ - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81 + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain) source $HOME/.cargo/env if test "${{ matrix.arch }}" = "aarch64"; then rustup target add aarch64-pc-windows-msvc else rustup target add x86_64-pc-windows-msvc fi + cd engine/ cargo install cargo-download --locked cargo download -x windows=0.58.0 export CARGO_INCREMENTAL=0 diff --git a/.rust-toolchain b/.rust-toolchain new file mode 100644 index 00000000..a92432a8 --- /dev/null +++ b/.rust-toolchain @@ -0,0 +1 @@ +1.82 diff --git a/l10n b/l10n index 778cb128..4094426d 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 778cb128c659c7b8f57080e99fbc04f8d93c30a2 +Subproject commit 4094426d24cf3e131b5a07775478ed893112e9da