Skip to content

Commit 114d917

Browse files
committed
chore: update required_ruby_version to >= 2.7.0
rake-compiler-dock 1.10.0 dropped support for Ruby 2.6.
1 parent f90e091 commit 114d917

File tree

9 files changed

+6
-347
lines changed

9 files changed

+6
-347
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/rust:${VARIANT}
44
ENV CHRUBY_VERSION="0.3.9" \
55
BUILD_LIST="build-essential clang libclang-dev openssh-server" \
66
DEBIAN_FRONTEND="noninteractive" \
7-
RUBY_VERSIONS="2.6.9 2.7.6 3.1.2 3.2.0-preview2"
7+
RUBY_VERSIONS="2.7.6 3.1.2 3.2.0-preview2"
88

99
USER root
1010

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ gem "base64", "~> 0.3.0"
1414
gem "yard"
1515
gem "mutex_m"
1616

17-
if RUBY_VERSION >= "2.6.0"
17+
if RUBY_VERSION >= "2.7.0"
1818
gem "standard", "~> 1.12.1"
1919
end

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ task test: ["test:cargo", "test:gem", "test:examples"]
7878
desc "Pretty the files"
7979
task :fmt do
8080
sh "cargo fmt"
81-
sh "bundle exec standardrb --fix" if RUBY_VERSION >= "2.6.0"
81+
sh "bundle exec standardrb --fix" if RUBY_VERSION >= "2.7.0"
8282
Dir.chdir("docsite") do
8383
sh "npm run fmt"
8484
end
@@ -90,7 +90,7 @@ task format: [:fmt]
9090

9191
desc "Lint"
9292
task :lint do
93-
sh "bundle exec standardrb --format #{ENV.key?("CI") ? "github" : "progress"}" if RUBY_VERSION >= "2.6.0"
93+
sh "bundle exec standardrb --format #{ENV.key?("CI") ? "github" : "progress"}" if RUBY_VERSION >= "2.7.0"
9494
sh "cargo fmt --check"
9595
sh "cargo clippy"
9696
sh "shellcheck $(git ls-files '*.sh')"

crates/rb-sys-env/readme.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ Here is an example of the `rustc-cfg` flags that are set by this crate:
7979
- `#[cfg(ruby_gt_2_4)]`
8080
- `#[cfg(ruby_gte_2_5)]`
8181
- `#[cfg(ruby_gt_2_5)]`
82-
- `#[cfg(ruby_gte_2_6)]`
83-
- `#[cfg(ruby_gt_2_6)]`
8482
- `#[cfg(ruby_gte_2_7)]`
8583
- `#[cfg(ruby_gt_2_7)]`
8684
- `#[cfg(ruby_gte_3_0)]`

crates/rb-sys/src/stable_api.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ mod compiled;
226226
use compiled as api;
227227

228228
#[cfg(stable_api_include_rust_impl)]
229-
#[cfg_attr(ruby_eq_2_6, path = "stable_api/ruby_2_6.rs")]
230229
#[cfg_attr(ruby_eq_2_7, path = "stable_api/ruby_2_7.rs")]
231230
#[cfg_attr(ruby_eq_3_0, path = "stable_api/ruby_3_0.rs")]
232231
#[cfg_attr(ruby_eq_3_1, path = "stable_api/ruby_3_1.rs")]

crates/rb-sys/src/stable_api/ruby_2_6.rs

Lines changed: 0 additions & 324 deletions
This file was deleted.

docker/Dockerfile.aarch64-mingw-ucrt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ENV RUBY_TARGET="aarch64-mingw-ucrt" \
88
RUSTUP_HOME="/usr/local/rustup" \
99
CARGO_HOME="/usr/local/cargo" \
1010
PATH="/usr/local/cargo/bin:/llvm-mingw/bin:$PATH" \
11-
LIBCLANG_PATH="/llvm-mingw/lib" \
11+
LIBCLANG_PATH="/usr/lib/llvm-10/lib" \
1212
CC_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-clang" \
1313
CXX_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-clang++" \
1414
AR_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-ar" \

0 commit comments

Comments
 (0)