h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-10 21:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Ignore rust-toolchain.toml in CI

Browse Source 
We set a specific default toolchain with dtolnay/rust-toolchain, we don't want
it to be overridden by the config intended for devs.
This commit is contained in:
Xiretza
2025-08-07 21:31:44 +00:00
parent 9714b98262
commit f806d35af8
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/rust-toolchain@oldest-supported/action.yml vendored
View File

@@ -20,3 +20,5 @@ runs:
with: with:
targets: ${{ inputs.targets }} targets: ${{ inputs.targets }}
components: ${{ inputs.components}} components: ${{ inputs.components}}
- run: rm rust-toolchain.toml
shell: sh

2
.github/actions/rust-toolchain@stable/action.yml vendored
View File

@@ -21,3 +21,5 @@ runs:
with: with:
targets: ${{ inputs.targets }} targets: ${{ inputs.targets }}
components: ${{ inputs.components }} components: ${{ inputs.components }}
- run: rm rust-toolchain.toml
shell: sh

2
.github/workflows/main.yml vendored
View File

@@ -39,6 +39,7 @@ jobs:
# Ensure that fish is available as an executable. # Ensure that fish is available as an executable.
PATH="$PWD/build:$PATH" build_tools/update_translations.fish --no-mo PATH="$PWD/build:$PATH" build_tools/update_translations.fish --no-mo
# Show diff output. Fail if there is any. # 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; } 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: ubuntu-32bit-static-pcre2:
@@ -87,6 +88,7 @@ jobs:
# ASAN uses `cargo build -Zbuild-std` which requires the rust-src component # ASAN uses `cargo build -Zbuild-std` which requires the rust-src component
# this is comma-separated # this is comma-separated
components: rust-src components: rust-src
- run: rm rust-toolchain.toml
- name: Install deps - name: Install deps
run: | run: |
sudo apt install gettext libpcre2-dev python3-pexpect tmux sudo apt install gettext libpcre2-dev python3-pexpect tmux