From f75129a39f708172247eab23120e9a50765384b6 Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 10:35:25 +0900 Subject: [PATCH 1/7] Use append_cflags to add compiler flags --- ext/ed25519_ref10/extconf.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/ed25519_ref10/extconf.rb b/ext/ed25519_ref10/extconf.rb index 49e469e..ed4c1b9 100644 --- a/ext/ed25519_ref10/extconf.rb +++ b/ext/ed25519_ref10/extconf.rb @@ -2,8 +2,6 @@ require "mkmf" -# rubocop:disable Style/GlobalVars -$CFLAGS << " -Wall -O3 -pedantic -std=c99" -# rubocop:enable Style/GlobalVars +append_cflags(["-Wall", "-O3", "-pedantic", "-std=c99"]) create_makefile "ed25519_ref10" From eea198f9b1fd07bf13fe08b3a2247fe06378364b Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 10:43:04 +0900 Subject: [PATCH 2/7] Update rubocop and rubocop-packaging gems --- .rubocop.yml | 8 +++++++- Gemfile | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bbae9e4..b29eccb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,4 @@ -require: +plugins: - rubocop-packaging AllCops: @@ -13,6 +13,12 @@ AllCops: Gemspec/DuplicatedAssignment: Enabled: false +Gemspec/DevelopmentDependencies: + Enabled: false + +Gemspec/RequireMFA: + Enabled: false + # # Layout # diff --git a/Gemfile b/Gemfile index b3c6be7..1fdd4ba 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,6 @@ group :development, :test do gem "rake", require: false gem "rake-compiler", "~> 1.0", require: false gem "rspec", "~> 3.7", require: false - gem "rubocop", "~> 1.12.1", require: false - gem "rubocop-packaging", "~> 0.5.1", require: false + gem "rubocop", "~> 1.75.4", require: false + gem "rubocop-packaging", "~> 0.6.0", require: false end From 5c849af3971446f308fb4612ed1411603f46da9f Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 11:07:39 +0900 Subject: [PATCH 3/7] Update CI workflow to test on latest Ruby versions --- .github/workflows/ci.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcec737..0fe41ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,18 +2,32 @@ name: CI on: push: - branches: main + branches: [main] pull_request: - branches: main + branches: [main] jobs: test: strategy: fail-fast: false matrix: - ruby: [ ruby-2.4, ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2, jruby-9.2.19, jruby-9.3.0, truffleruby ] - os: [ ubuntu-latest, windows-latest ] + ruby: + [ + ruby-2.4, + ruby-2.5, + ruby-2.6, + ruby-2.7, + ruby-3.0, + ruby-3.1, + ruby-3.2, + ruby-3.3, + ruby-3.4, + jruby-9.2.19, + jruby-9.3.0, + truffleruby, + ] + os: [ubuntu-latest, windows-latest] exclude: - { ruby: truffleruby, os: windows-latest } From 5af55b36febbc47fa534fa658a7418ae1fbed250 Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 11:27:56 +0900 Subject: [PATCH 4/7] Remove EOL versions of Ruby/JRuby, add recent JRubies to CI test matrix --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fe41ee..f738ae4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,17 +14,13 @@ jobs: matrix: ruby: [ - ruby-2.4, - ruby-2.5, - ruby-2.6, - ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2, ruby-3.3, ruby-3.4, - jruby-9.2.19, - jruby-9.3.0, + jruby-9.4.12, + jruby-10.0.0, truffleruby, ] os: [ubuntu-latest, windows-latest] From 90652a34e9c57e63c230bfcc114ba1a701c943c1 Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 11:36:03 +0900 Subject: [PATCH 5/7] Set minimum Ruby version to 3.0 --- .github/workflows/ci.yml | 4 ++-- .rubocop.yml | 2 +- ed25519.gemspec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f738ae4..2065626 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,8 +57,8 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.4 - bundler: 2.3.26 + ruby-version: 3.0 + bundler: 2.5.23 - uses: actions/cache@v3 with: diff --git a/.rubocop.yml b/.rubocop.yml index b29eccb..9538b3b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ plugins: - rubocop-packaging AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 3.0 DisplayCopNames: true NewCops: enable diff --git a/ed25519.gemspec b/ed25519.gemspec index be8f9c0..c568088 100644 --- a/ed25519.gemspec +++ b/ed25519.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.extensions = ["ext/ed25519_ref10/extconf.rb"] end - spec.required_ruby_version = ">= 2.4.0" + spec.required_ruby_version = ">= 3.0" spec.add_development_dependency "bundler" end From 5f1af2aa03fe4670fae473c11d5e095845c5667a Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 11:37:15 +0900 Subject: [PATCH 6/7] README updates --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7eaea1..0c0d7a6 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ Have questions? Want to suggest a feature or change? Join a discussion group: **ed25519.rb** is supported on and tested against the following platforms: -* MRI 2.4, 2.5, 2.6, 2.7, 3.0 -* JRuby 9.2.19, 9.3.0 +- MRI 3.0, 3.1, 3.2, 3.3, 3.4 +- JRuby 9.4.12, 10.0.0 ## Installation From 9b98e986af8352329f68e699817af2c41d767a90 Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 30 Apr 2025 11:37:42 +0900 Subject: [PATCH 7/7] Exclude testing on JRuby 10.0.0 on Windows --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2065626..de016e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,7 @@ jobs: os: [ubuntu-latest, windows-latest] exclude: - { ruby: truffleruby, os: windows-latest } + - { ruby: jruby-10.0.0, os: windows-latest } runs-on: ${{ matrix.os }}