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 .github/workflows/e2e-dummy-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-22.04", "windows-latest"]
rubies: ["3.4.7", "3.1.7"]
rubies: ["3.1", "3.4"]
type: ["cross", "native"]
runs-on: "${{ matrix.os }}"
steps:
Expand Down
2 changes: 1 addition & 1 deletion lib/easy_compile/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def ci_template
ruby_requirements = compilation_task.gemspec.required_ruby_version
latest_supported_ruby_version = RubySeries.latest_version_for_requirements(ruby_requirements)
runtime_version_for_compilation = RubySeries.runtime_version_for_compilation(ruby_requirements)
ruby_versions_for_testing = RubySeries.versions_to_test_agaist(ruby_requirements).map(&:to_s)
ruby_versions_for_testing = RubySeries.versions_to_test_against(ruby_requirements)

directory(".github", context: instance_eval("binding"))
end
Expand Down
8 changes: 6 additions & 2 deletions lib/easy_compile/ruby_series.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ def versions_to_compile_against(requirements)
end
end

def versions_to_test_agaist(requirements)
latest_rubies.select do |ruby_version|
def versions_to_test_against(requirements)
selected_rubies = latest_rubies.select do |ruby_version|
requirements.satisfied_by?(ruby_version)
end.reverse

selected_rubies.map do |version|
version.segments.tap(&:pop).join('.')
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/expected_github_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-22.04"]
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
rubies: ["3.1", "3.2", "3.3", "3.4"]
type: ["cross", "native"]
runs-on: "${{ matrix.os }}"
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-22.04"]
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
rubies: ["3.1", "3.2", "3.3", "3.4"]
type: ["cross", "native"]
runs-on: "${{ matrix.os }}"
steps:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/expected_github_workflow_test_command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-22.04"]
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
rubies: ["3.1", "3.2", "3.3", "3.4"]
type: ["cross", "native"]
runs-on: "${{ matrix.os }}"
steps:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/expected_github_workflow_working_dir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "ubuntu-22.04"]
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
rubies: ["3.1", "3.2", "3.3", "3.4"]
type: ["cross", "native"]
runs-on: "${{ matrix.os }}"
steps:
Expand Down
6 changes: 3 additions & 3 deletions test/ruby_series_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ def test_versions_to_compile_against_bis
def test_versions_to_test_against
requirements = Gem::Requirement.new("~> 3.4")

assert_equal(["3.4.7"], RubySeries.versions_to_test_agaist(requirements).map(&:to_s))
assert_equal(["3.4"], RubySeries.versions_to_test_against(requirements).map(&:to_s))
end

def test_versions_to_test_against_bis
requirements = Gem::Requirement.new(">= 3.1")
expected = ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
expected = ["3.1", "3.2", "3.3", "3.4"]

assert_equal(expected, RubySeries.versions_to_test_agaist(requirements).map(&:to_s))
assert_equal(expected, RubySeries.versions_to_test_against(requirements).map(&:to_s))
end
end
end