diff --git a/.github/actions/rust-toolchain@oldest-supported/action.yml b/.github/actions/rust-toolchain@oldest-supported/action.yml index 4c9a005b9..cbdfe382b 100644 --- a/.github/actions/rust-toolchain@oldest-supported/action.yml +++ b/.github/actions/rust-toolchain@oldest-supported/action.yml @@ -20,5 +20,3 @@ 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 46f74ed26..4da4e365d 100644 --- a/.github/actions/rust-toolchain@stable/action.yml +++ b/.github/actions/rust-toolchain@stable/action.yml @@ -16,10 +16,7 @@ permissions: runs: using: "composite" steps: - # also update in rust-toolchain.toml - - uses: dtolnay/rust-toolchain@1.89.0 + - uses: dtolnay/rust-toolchain@1.89 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 9463b99e5..75ae68e6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,6 @@ 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: @@ -88,7 +87,6 @@ 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 diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index bd30ff00d..000000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] -# also update in .github/actions/rust-toolchain@stable/action.yml -channel = "1.89.0"