From f806d35af827c806f05ce733546fcaacf778278a Mon Sep 17 00:00:00 2001 From: Xiretza Date: Thu, 7 Aug 2025 21:31:44 +0000 Subject: [PATCH] Ignore rust-toolchain.toml in CI We set a specific default toolchain with dtolnay/rust-toolchain, we don't want it to be overridden by the config intended for devs. --- .github/actions/rust-toolchain@oldest-supported/action.yml | 2 ++ .github/actions/rust-toolchain@stable/action.yml | 2 ++ .github/workflows/main.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/actions/rust-toolchain@oldest-supported/action.yml b/.github/actions/rust-toolchain@oldest-supported/action.yml index cbdfe382b..4c9a005b9 100644 --- a/.github/actions/rust-toolchain@oldest-supported/action.yml +++ b/.github/actions/rust-toolchain@oldest-supported/action.yml @@ -20,3 +20,5 @@ runs: with: targets: ${{ inputs.targets }} components: ${{ inputs.components}} + - run: rm rust-toolchain.toml + shell: sh diff --git a/.github/actions/rust-toolchain@stable/action.yml b/.github/actions/rust-toolchain@stable/action.yml index 49795b6a6..ea3c484bd 100644 --- a/.github/actions/rust-toolchain@stable/action.yml +++ b/.github/actions/rust-toolchain@stable/action.yml @@ -21,3 +21,5 @@ runs: with: targets: ${{ inputs.targets }} components: ${{ inputs.components }} + - run: rm rust-toolchain.toml + shell: sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75ae68e6d..9463b99e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,7 @@ jobs: # Ensure that fish is available as an executable. PATH="$PWD/build:$PATH" build_tools/update_translations.fish --no-mo # Show diff output. Fail if there is any. + git restore --worktree rust-toolchain.toml git --no-pager diff --exit-code || { echo 'There are uncommitted changes after regenerating the gettext PO files. Make sure to update them via `build_tools/update_translations.fish --no-mo` after changing source files.'; exit 1; } ubuntu-32bit-static-pcre2: @@ -87,6 +88,7 @@ jobs: # ASAN uses `cargo build -Zbuild-std` which requires the rust-src component # this is comma-separated components: rust-src + - run: rm rust-toolchain.toml - name: Install deps run: | sudo apt install gettext libpcre2-dev python3-pexpect tmux