summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2024-02-12 21:01:20 +0100
committerKirill Chibisov <contact@kchibisov.com>2024-02-14 01:20:49 +0400
commit1645a70168ca012bcf6f2cab42271dd51ae682a2 (patch)
treeafd9cc1091a9a42e61ec2333686795a6fee100ed
parent5c4469ffa7727b7a8d82f3f8261613a30591b4de (diff)
Use dynamic MSRV for oldstable CI
Instead of manually specifying the oldstable version in all our CI scripts, it is now pulled from the `Cargo.toml` which simplifies the update process. The contributing guide has also been updated to not include the explicit version and its wording has been loosened a bit to correctly represent current maintenance practices.
-rw-r--r--.builds/freebsd.yml5
-rw-r--r--.builds/linux.yml5
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--CONTRIBUTING.md5
4 files changed, 10 insertions, 7 deletions
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 4c9860b5..5e5021c6 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -24,8 +24,9 @@ tasks:
cargo test
- oldstable: |
cd alacritty
- rustup toolchain install --profile minimal 1.70.0
- rustup default 1.70.0
+ oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
+ rustup toolchain install --profile minimal $oldstable
+ rustup default $oldstable
cargo test
- clippy: |
cd alacritty
diff --git a/.builds/linux.yml b/.builds/linux.yml
index f2e9038a..e036261b 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -34,8 +34,9 @@ tasks:
cargo test
- oldstable: |
cd alacritty
- rustup toolchain install --profile minimal 1.70.0
- rustup default 1.70.0
+ oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
+ rustup toolchain install --profile minimal $oldstable
+ rustup default $oldstable
cargo test
- clippy: |
cd alacritty
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a0b5f6f..573c4e0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
run: cargo test -p alacritty_terminal --no-default-features
- name: Oldstable
run: |
- rustup default 1.70.0
+ rustup default $(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
cargo test
- name: Clippy
run: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 334a3e76..b07c02ef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,8 +42,9 @@ and
[easy](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22)
issues.
-Please note that the minimum supported version of Alacritty is Rust 1.70.0. All patches are expected
-to work with the minimum supported version.
+You can find the minimum supported Rust version in Alacritty's manifest file
+(`cat alacritty/Cargo.toml | grep "rust-version"`). Alacritty **must** always
+build with the MSRV and bumping it should be avoided if possible.
Since `alacritty_terminal`'s version always tracks the next release, make sure that the version is
bumped according to semver when necessary.