Skip to content

Commit 2ae9e08

Browse files
committed
Don't vendor ruby-build
1 parent 07a3acb commit 2ae9e08

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+5
-1954
lines changed

lib/shopify_ruby_definitions.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require_relative "shopify_ruby_definitions/ruby_build"
43
require_relative "shopify_ruby_definitions/ruby_versions"
54
require_relative "shopify_ruby_definitions/version"
65

lib/shopify_ruby_definitions/ruby_build.rb

Lines changed: 0 additions & 7 deletions
This file was deleted.

lib/shopify_ruby_definitions/ruby_versions.rb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
module ShopifyRubyDefinitions
44
module RubyVersions
5-
VERSIONS_DIRECTORY = File.join(RubyBuild::RUBY_BUILD_DIRECTORY, "share/ruby-build")
5+
VERSIONS_DIRECTORY = File.expand_path("../../../rubies", __FILE__)
66
ALL_VERSIONS = Dir["#{VERSIONS_DIRECTORY}/*"].map { |f| File.basename(f) }
77

88
def version_overrides
99
{
10-
"head" => ruby_head_version,
11-
"ruby-head" => ruby_head_version,
1210
"3.0.0" => "3.0.0-pshopify9",
1311
"3.0.1" => "3.0.1-pshopify2",
1412
"3.0.2" => "3.0.2-pshopify3",
@@ -26,18 +24,12 @@ def version_overrides
2624
def resolve_version(version)
2725
if version.match?(/\A\d+\.\d+\z/)
2826
pattern = /\A#{Regexp.escape(version)}\.(\d+)\z/
29-
versions = ALL_VERSIONS.grep(pattern)
27+
versions = version_overrides.keys.grep(pattern)
3028
unless versions.empty?
3129
version = versions.max_by { |v| v.match(pattern)[1].to_i }
3230
end
3331
end
3432
version_overrides.fetch(version, version)
3533
end
36-
37-
private
38-
39-
def ruby_head_version
40-
ALL_VERSIONS.grep(/\A[\d\.]+-dev\z/).max
41-
end
4234
end
4335
end

0 commit comments

Comments
 (0)