From fcd79f5f5af51914056731a448e542993e7e8569 Mon Sep 17 00:00:00 2001 From: Paul Mucur Date: Sun, 29 Dec 2024 10:56:23 +0000 Subject: [PATCH] Restore support for Ruby 2.6 and 2.7 --- .github/workflows/tests.yml | 72 ++++++++++++++++++++++++++++--------- Rakefile | 2 +- argon2id.gemspec | 2 +- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9394087..c6851e2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -115,8 +115,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4", "truffleruby"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "truffleruby"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } - { ruby: "3.1", rubygems: "default" } - { ruby: "3.2", rubygems: "default" } @@ -144,8 +146,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } - { ruby: "3.1", rubygems: "default" } - { ruby: "3.2", rubygems: "default" } @@ -169,13 +173,21 @@ jobs: test-windows-2019: needs: "build-cruby-gem" + strategy: + fail-fast: false + matrix: + ruby: ["2.6", "2.7", "3.0"] + include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } + - { ruby: "3.0", rubygems: "3.5.23" } runs-on: "windows-2019" steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" - rubygems: "3.5.23" + ruby-version: "${{ matrix.ruby }}" + rubygems: "${{ matrix.rubygems }}" bundler-cache: true - uses: actions/download-artifact@v4 with: @@ -234,8 +246,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -257,8 +271,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -280,8 +296,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -303,8 +321,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -326,8 +346,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -349,8 +371,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest steps: @@ -372,8 +396,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } - { ruby: "3.1", rubygems: "default" } - { ruby: "3.2", rubygems: "default" } @@ -400,8 +426,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } runs-on: ubuntu-latest container: @@ -419,8 +447,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } - { ruby: "3.1", rubygems: "default" } - { ruby: "3.2", rubygems: "default" } @@ -447,8 +477,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"] + ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"] include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } - { ruby: "3.0", rubygems: "3.5.23" } - { ruby: "3.1", rubygems: "default" } - { ruby: "3.2", rubygems: "default" } @@ -511,13 +543,21 @@ jobs: test-precompiled-x64-mingw32: needs: "precompile-x64-mingw32" + strategy: + fail-fast: false + matrix: + ruby: ["2.6", "2.7", "3.0"] + include: + - { ruby: "2.6", rubygems: "3.4.22" } + - { ruby: "2.7", rubygems: "3.4.22" } + - { ruby: "3.0", rubygems: "3.5.23" } runs-on: windows-2019 steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" - rubygems: "3.5.23" + ruby-version: "${{ matrix.ruby }}" + rubygems: "${{ matrix.rubygems }}" bundler-cache: true - uses: actions/download-artifact@v4 with: diff --git a/Rakefile b/Rakefile index 3736cb8..322f7c1 100644 --- a/Rakefile +++ b/Rakefile @@ -20,7 +20,7 @@ cross_platforms = %w[ x86_64-linux-musl ].freeze -ENV["RUBY_CC_VERSION"] = %w[3.4.0 3.3.5 3.2.0 3.1.0 3.0.0].join(":") +ENV["RUBY_CC_VERSION"] = %w[3.4.0 3.3.5 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(":") gemspec = Gem::Specification.load("argon2id.gemspec") diff --git a/argon2id.gemspec b/argon2id.gemspec index 9dfcf6a..704a2b4 100644 --- a/argon2id.gemspec +++ b/argon2id.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| "source_code_uri" => "https://github.com/mudge/argon2id", "rubygems_mfa_required" => "true" } - s.required_ruby_version = ">= 3.0.0" + s.required_ruby_version = ">= 2.6.0" s.extensions = ["ext/argon2id/extconf.rb"] s.files = [ "CHANGELOG.md",