Skip to content

Treat -pre version suffix as prerelease. #10207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdulapopoola merged 4 commits into from
Jul 15, 2024
Merged

Treat -pre version suffix as prerelease. #10207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b824f6
Treat `-pre` version suffix as prerelease.
dbrant Jul 13, 2024
e518cdf
Apply to both gradle and maven, and add tests.
dbrant Jul 13, 2024
fd134db
Merge branch 'main' into mavenPreVer
abdulapopoola Jul 15, 2024
0d13810
Merge branch 'main' into mavenPreVer
abdulapopoola Jul 15, 2024
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 gradle/lib/dependabot/gradle/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Version < Dependabot::Version
"a" => 1, "alpha" => 1,
"b" => 2, "beta" => 2,
"m" => 3, "milestone" => 3,
"rc" => 4, "cr" => 4, "pr" => 4,
"rc" => 4, "cr" => 4, "pr" => 4, "pre" => 4,
"snapshot" => 5, "dev" => 5,
"ga" => 6, "" => 6, "final" => 6,
"sp" => 7
Expand Down
8 changes: 7 additions & 1 deletion gradle/spec/dependabot/gradle/version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,18 @@
it { is_expected.to be(false) }
end

context "with a pre-release" do
context "with a 'pr' pre-release separated with a ." do
let(:version_string) { "2.10.0.pr3" }

it { is_expected.to be(true) }
end

context "with a 'pre' pre-release separated with a -" do
let(:version_string) { "2.10.0-pre0" }

it { is_expected.to be(true) }
end

context "with a release" do
let(:version_string) { "1.0.0" }

Expand Down
2 changes: 1 addition & 1 deletion maven/lib/dependabot/maven/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Version < Dependabot::Version
"a" => 1, "alpha" => 1,
"b" => 2, "beta" => 2,
"m" => 3, "milestone" => 3,
"rc" => 4, "cr" => 4, "pr" => 4,
"rc" => 4, "cr" => 4, "pr" => 4, "pre" => 4,
"snapshot" => 5, "dev" => 5,
"ga" => 6, "" => 6, "final" => 6,
"sp" => 7
Expand Down
8 changes: 7 additions & 1 deletion maven/spec/dependabot/maven/version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,18 @@
it { is_expected.to be(false) }
end

context "with a pre-release" do
context "with a 'pr' pre-release separated with a ." do
let(:version_string) { "2.10.0.pr3" }

it { is_expected.to be(true) }
end

context "with a 'pre' pre-release separated with a -" do
let(:version_string) { "2.10.0-pre0" }

it { is_expected.to be(true) }
end

context "with a dev token" do
let(:version_string) { "1.2.1-dev-65" }

Expand Down