Skip to content

Commit a45ef2f

Browse files
committed
Ruby versions in natural order without patch version:
Adressing feedback from users.
1 parent a2959de commit a45ef2f

File tree

8 files changed

+15
-11
lines changed

8 files changed

+15
-11
lines changed

.github/workflows/e2e-dummy-gem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
matrix:
3131
os: ["macos-latest", "ubuntu-22.04", "windows-latest"]
32-
rubies: ["3.4.7", "3.1.7"]
32+
rubies: ["3.1", "3.4"]
3333
type: ["cross", "native"]
3434
runs-on: "${{ matrix.os }}"
3535
steps:

lib/easy_compile/cli.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def ci_template
9898
ruby_requirements = compilation_task.gemspec.required_ruby_version
9999
latest_supported_ruby_version = RubySeries.latest_version_for_requirements(ruby_requirements)
100100
runtime_version_for_compilation = RubySeries.runtime_version_for_compilation(ruby_requirements)
101-
ruby_versions_for_testing = RubySeries.versions_to_test_agaist(ruby_requirements).map(&:to_s)
101+
ruby_versions_for_testing = RubySeries.versions_to_test_against(ruby_requirements)
102102

103103
directory(".github", context: instance_eval("binding"))
104104
end

lib/easy_compile/ruby_series.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ def versions_to_compile_against(requirements)
2525
end
2626
end
2727

28-
def versions_to_test_agaist(requirements)
29-
latest_rubies.select do |ruby_version|
28+
def versions_to_test_against(requirements)
29+
selected_rubies = latest_rubies.select do |ruby_version|
3030
requirements.satisfied_by?(ruby_version)
31+
end.reverse
32+
33+
selected_rubies.map do |version|
34+
version.segments.tap(&:pop).join('.')
3135
end
3236
end
3337

test/fixtures/expected_github_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
os: ["macos-latest", "ubuntu-22.04"]
37-
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
37+
rubies: ["3.1", "3.2", "3.3", "3.4"]
3838
type: ["cross", "native"]
3939
runs-on: "${{ matrix.os }}"
4040
steps:

test/fixtures/expected_github_workflow_test_and_workdir.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
os: ["macos-latest", "ubuntu-22.04"]
39-
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
39+
rubies: ["3.1", "3.2", "3.3", "3.4"]
4040
type: ["cross", "native"]
4141
runs-on: "${{ matrix.os }}"
4242
steps:

test/fixtures/expected_github_workflow_test_command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
os: ["macos-latest", "ubuntu-22.04"]
37-
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
37+
rubies: ["3.1", "3.2", "3.3", "3.4"]
3838
type: ["cross", "native"]
3939
runs-on: "${{ matrix.os }}"
4040
steps:

test/fixtures/expected_github_workflow_working_dir.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
os: ["macos-latest", "ubuntu-22.04"]
39-
rubies: ["3.4.7", "3.3.9", "3.2.9", "3.1.7"]
39+
rubies: ["3.1", "3.2", "3.3", "3.4"]
4040
type: ["cross", "native"]
4141
runs-on: "${{ matrix.os }}"
4242
steps:

test/ruby_series_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ def test_versions_to_compile_against_bis
5050
def test_versions_to_test_against
5151
requirements = Gem::Requirement.new("~> 3.4")
5252

53-
assert_equal(["3.4.7"], RubySeries.versions_to_test_agaist(requirements).map(&:to_s))
53+
assert_equal(["3.4"], RubySeries.versions_to_test_against(requirements).map(&:to_s))
5454
end
5555

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

60-
assert_equal(expected, RubySeries.versions_to_test_agaist(requirements).map(&:to_s))
60+
assert_equal(expected, RubySeries.versions_to_test_against(requirements).map(&:to_s))
6161
end
6262
end
6363
end

0 commit comments

Comments
 (0)