mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 04:43:10 +00:00
Increase MSRV to 1.70
It appears we can't find a system that ships rustc >= 1.67 and < 1.70, so keeping it at 1.67 gains nothing. 1.70 is used in Debian 13, so that will be able to build fish out of the box (12 was on 1.63 which was already too low).
This commit is contained in:
parent
0aa588a129
commit
16fcc5de7c
7 changed files with 10 additions and 10 deletions
|
@ -103,7 +103,7 @@ freebsd_task:
|
|||
- mkdir build && cd build
|
||||
- chown -R fish-user ..
|
||||
- sudo -u fish-user -s whoami
|
||||
# FreeBSD's pkg currently has rust 1.66.0 while we need rust 1.67.0+. Use rustup to install
|
||||
# FreeBSD's pkg currently has rust 1.66.0 while we need rust 1.70.0+. Use rustup to install
|
||||
# the latest, but note that it only installs rust per-user.
|
||||
- sudo -u fish-user -s fetch -qo - https://sh.rustup.rs > rustup.sh
|
||||
- sudo -u fish-user -s sh ./rustup.sh -y --profile=minimal
|
||||
|
|
8
.github/workflows/main.yml
vendored
8
.github/workflows/main.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: dtolnay/rust-toolchain@1.67
|
||||
- uses: dtolnay/rust-toolchain@1.70
|
||||
- name: Install deps
|
||||
run: |
|
||||
sudo apt install gettext libpcre2-dev python3-pip tmux
|
||||
|
@ -43,7 +43,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: dtolnay/rust-toolchain@1.67
|
||||
- uses: dtolnay/rust-toolchain@1.70
|
||||
with:
|
||||
targets: "i686-unknown-linux-gnu" # rust-toolchain wants this comma-separated
|
||||
- name: Install deps
|
||||
|
@ -127,7 +127,7 @@ jobs:
|
|||
#
|
||||
# steps:
|
||||
# - uses: actions/checkout@v4
|
||||
# - uses: dtolnay/rust-toolchain@1.67
|
||||
# - uses: dtolnay/rust-toolchain@1.70
|
||||
# - name: Install deps
|
||||
# run: |
|
||||
# sudo apt install gettext libpcre2-dev python3-pip tmux
|
||||
|
@ -154,7 +154,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: dtolnay/rust-toolchain@1.67
|
||||
- uses: dtolnay/rust-toolchain@1.70
|
||||
- name: Install deps
|
||||
run: |
|
||||
# --break-system-packages because homebrew has now declared itself "externally managed".
|
||||
|
|
|
@ -4,7 +4,7 @@ members = [
|
|||
]
|
||||
|
||||
[workspace.package]
|
||||
rust-version = "1.67"
|
||||
rust-version = "1.70"
|
||||
edition = "2021"
|
||||
|
||||
[profile.release]
|
||||
|
|
|
@ -138,7 +138,7 @@ Dependencies, git master
|
|||
|
||||
Building from git master currently requires, in addition to the dependencies for a tarball:
|
||||
|
||||
- Rust (version 1.67 or later)
|
||||
- Rust (version 1.70 or later)
|
||||
- CMake (version 3.19 or later)
|
||||
- libclang, even if you are compiling with GCC
|
||||
- an Internet connection
|
||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -6,7 +6,7 @@ Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
|
|||
# Debhelper should be bumped to >= 10 once Ubuntu Xenial is no longer supported
|
||||
Build-Depends: debhelper (>= 9.20160115), cmake (>= 3.5.0), gettext, libpcre2-dev,
|
||||
# Test dependencies
|
||||
locales-all, python3, rustc (>= 1.67) | rustc-mozilla (>= 1.67), cargo
|
||||
locales-all, python3, rustc (>= 1.70) | rustc-mozilla (>= 1.70), cargo
|
||||
Standards-Version: 4.1.5
|
||||
Homepage: https://fishshell.com/
|
||||
Vcs-Git: https://github.com/fish-shell/fish-shell.git
|
||||
|
|
|
@ -18,7 +18,7 @@ We use forks of the last two - see the [FFI section](#ffi) below. No special act
|
|||
|
||||
### Build Dependencies
|
||||
|
||||
fish-shell currently depends on Rust 1.67 or later. To install Rust, follow https://rustup.rs.
|
||||
fish-shell currently depends on Rust 1.70 or later. To install Rust, follow https://rustup.rs.
|
||||
|
||||
### Build via CMake
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ URL: https://fishshell.com/
|
|||
|
||||
Source0: %{name}_@VERSION@.orig.tar.xz
|
||||
BuildRequires: cargo gettext gcc-c++ xz pcre2-devel
|
||||
BuildRequires: rust >= 1.67
|
||||
BuildRequires: rust >= 1.70
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
BuildRequires: cmake3
|
||||
|
|
Loading…
Reference in a new issue