From ba4cbc334c653d620190d2f236c42d2bdcdc7c88 Mon Sep 17 00:00:00 2001 From: Stefan VanBuren Date: Mon, 17 Jun 2024 10:23:28 -0400 Subject: [PATCH] Fix Go modules prerelease The `@prerelease` component should include everything after the `-`, not only the initial split. Fixes #10020. --- go_modules/lib/dependabot/go_modules/version.rb | 2 +- go_modules/spec/dependabot/go_modules/version_spec.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go_modules/lib/dependabot/go_modules/version.rb b/go_modules/lib/dependabot/go_modules/version.rb index 3bb8f808894..59297b768bd 100644 --- a/go_modules/lib/dependabot/go_modules/version.rb +++ b/go_modules/lib/dependabot/go_modules/version.rb @@ -30,7 +30,7 @@ def initialize(version) @version_string = version.to_s.gsub(/^v/, "") version = version.gsub(/^v/, "") if version.is_a?(String) version = version.to_s.split("+").first if version.to_s.include?("+") - version, @prerelease = version.to_s.split("-") if version.to_s.include?("-") + version, @prerelease = version.to_s.split("-", 2) if version.to_s.include?("-") super end diff --git a/go_modules/spec/dependabot/go_modules/version_spec.rb b/go_modules/spec/dependabot/go_modules/version_spec.rb index bfbf365716b..4159ac35903 100644 --- a/go_modules/spec/dependabot/go_modules/version_spec.rb +++ b/go_modules/spec/dependabot/go_modules/version_spec.rb @@ -184,7 +184,9 @@ "v1.1.0-rc0", "v1.1.0-rc5", "v1.1.0-rc6", - "v1.1.0" + "v1.1.0", + "v1.34.2-20220907172603-9a877cf260e1.1", + "v1.34.2-20220907172603-9a877cf260e1.2" ] sorted_versions.combination(2).each do |lhs, rhs| it "'#{lhs}' < '#{rhs}'" do