Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/rust:${VARIANT}
ENV CHRUBY_VERSION="0.3.9" \
BUILD_LIST="build-essential clang libclang-dev openssh-server" \
DEBIAN_FRONTEND="noninteractive" \
RUBY_VERSIONS="2.6.9 2.7.6 3.1.2 3.2.0-preview2"
RUBY_VERSIONS="2.7.6 3.1.2 3.2.0-preview2"

USER root

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ gemspec path: "examples/rust_reverse"
gem "rake", "~> 13.0"
gem "minitest", "5.15.0"
gem "rake-compiler", "~> 1.3.0" # Small bug in 1.2.4 that breaks Ruby 2.5
gem "rake-compiler-dock", "1.9.1" # This should match the versions used in docker/Dockerfile.*
gem "rake-compiler-dock", "1.10.0" # This should match the versions used in docker/Dockerfile.*
gem "racc", "~> 1.7"
gem "base64", "~> 0.3.0"
gem "yard"
gem "mutex_m"

if RUBY_VERSION >= "2.6.0"
if RUBY_VERSION >= "2.7.0"
gem "standard", "~> 1.12.1"
end
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ task test: ["test:cargo", "test:gem", "test:examples"]
desc "Pretty the files"
task :fmt do
sh "cargo fmt"
sh "bundle exec standardrb --fix" if RUBY_VERSION >= "2.6.0"
sh "bundle exec standardrb --fix" if RUBY_VERSION >= "2.7.0"
Dir.chdir("docsite") do
sh "npm run fmt"
end
Expand All @@ -90,7 +90,7 @@ task format: [:fmt]

desc "Lint"
task :lint do
sh "bundle exec standardrb --format #{ENV.key?("CI") ? "github" : "progress"}" if RUBY_VERSION >= "2.6.0"
sh "bundle exec standardrb --format #{ENV.key?("CI") ? "github" : "progress"}" if RUBY_VERSION >= "2.7.0"
sh "cargo fmt --check"
sh "cargo clippy"
sh "shellcheck $(git ls-files '*.sh')"
Expand Down
2 changes: 0 additions & 2 deletions crates/rb-sys-env/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ Here is an example of the `rustc-cfg` flags that are set by this crate:
- `#[cfg(ruby_gt_2_4)]`
- `#[cfg(ruby_gte_2_5)]`
- `#[cfg(ruby_gt_2_5)]`
- `#[cfg(ruby_gte_2_6)]`
- `#[cfg(ruby_gt_2_6)]`
- `#[cfg(ruby_gte_2_7)]`
- `#[cfg(ruby_gt_2_7)]`
- `#[cfg(ruby_gte_3_0)]`
Expand Down
1 change: 0 additions & 1 deletion crates/rb-sys/src/stable_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ mod compiled;
use compiled as api;

#[cfg(stable_api_include_rust_impl)]
#[cfg_attr(ruby_eq_2_6, path = "stable_api/ruby_2_6.rs")]
#[cfg_attr(ruby_eq_2_7, path = "stable_api/ruby_2_7.rs")]
#[cfg_attr(ruby_eq_3_0, path = "stable_api/ruby_3_0.rs")]
#[cfg_attr(ruby_eq_3_1, path = "stable_api/ruby_3_1.rs")]
Expand Down
324 changes: 0 additions & 324 deletions crates/rb-sys/src/stable_api/ruby_2_6.rs

This file was deleted.

4 changes: 4 additions & 0 deletions data/derived/github-actions-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"ruby-platform": "x64-mingw-ucrt",
"rust-target": "x86_64-pc-windows-gnu"
},
{
"ruby-platform": "aarch64-mingw-ucrt",
"rust-target": "aarch64-pc-windows-gnullvm"
},
{
"ruby-platform": "x64-mingw32",
"rust-target": "x86_64-pc-windows-gnu"
Expand Down
Loading
Loading