diff options
| author | Alan Wu <XrXr@users.noreply.github.com> | 2022-05-29 13:43:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 13:43:02 -0400 |
| commit | 899c90cf8a5243911987a6d2fa5f21e0cfbbe7dc (patch) | |
| tree | 5b10f9827aa5669f6a9adb32175de1915bf3cce3 | |
| parent | 93d1eb71b8fe126cb23c0057ecd77690fbb44982 (diff) | |
YJIT: Relax minimum Rust version requirement to 1.58.1
We want to make it convenient for people to build YJIT and Rust version 1.58.1
or above is available on Ubuntu Jammy, Debian testing, and Fedora 36 through
the usual package manager on those systems. This saves the need to install
`rustup` for some people.
Our code is already 1.58.1 compatible so this commit simply tweaks CI to make
sure that we keep supporting that version. We still test against the latest Rust
version in `--enable-yjit=dev` builds through the Rust version available in
GitHub's CI image.
Rust versions older than 1.58.1 might build YJIT today, but we might make
incompatible changes in the future.
Co-authored-by: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@shopify.com>
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5951
Merged-By: XrXr
| -rw-r--r-- | .github/workflows/yjit-ubuntu.yml | 6 | ||||
| -rw-r--r-- | yjit/Cargo.toml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml index 5dac4375f2..cf96590b60 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -42,7 +42,8 @@ jobs: configure: "--with-gcc=clang-12 --enable-yjit=dev" - test_task: "check" - configure: "--enable-yjit" # release build + configure: "--enable-yjit RUSTC='rustc +1.58.1'" # release build + rust_version: "1.58.1" - test_task: "check" configure: "--enable-yjit=dev" @@ -70,6 +71,9 @@ jobs: set -x sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + - name: Install Rust + if: ${{ matrix.rust_version }} + run: rustup install ${{ matrix.rust_version }} --profile minimal - name: git config run: | git config --global advice.detachedHead 0 diff --git a/yjit/Cargo.toml b/yjit/Cargo.toml index 8969f897ad..a5208049cb 100644 --- a/yjit/Cargo.toml +++ b/yjit/Cargo.toml @@ -6,7 +6,7 @@ name = "yjit" version = "0.1.0" # YJIT version edition = "2021" # Rust 2021 edition to compile with -rust-version = "1.60.0" # Minimally supported rust version +rust-version = "1.58.1" # Minimally supported rust version publish = false # Don't publish to crates.io [lib] |