Skip to content

fix: Fix tag order from git tag function. #30

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
zachdaniel merged 2 commits into from
Feb 20, 2020
Merged

fix: Fix tag order from git tag function. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
713d121
fix: Fix tag order from git tag function.
asummers Feb 19, 2020
96a1758
fix: Move version tag parsing logic
asummers Feb 20, 2020
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
13 changes: 9 additions & 4 deletions lib/git_ops/git.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,20 @@ defmodule GitOps.Git do
def tags(repo) do
tags =
repo
|> Git.tag!()
|> String.split("\n")
|> Git.rev_list!(["--tags"])
|> String.split("\n", trim: true)

if Enum.empty?(tags) do
semver_tags =
repo
|> Git.describe!(["--always", "--abbrev=0", "--tags"] ++ tags)
|> String.split("\n", trim: true)

if Enum.empty?(semver_tags) do
raise """
Could not find an appropriate semver tag in git history. Ensure that you have initialized the project and commited the result.
"""
else
tags
semver_tags
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/git_ops/version.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ defmodule GitOps.Version do
@spec last_valid_non_rc_version([String.t()], String.t()) :: String.t() | nil
def last_valid_non_rc_version(versions, prefix) do
versions
|> Enum.reverse()
|> Enum.reject(fn tag -> parse(prefix, tag) == :error end)
|> Enum.find(fn version ->
match?({:ok, %{pre: []}}, parse(prefix, version))
end)
Expand Down
4 changes: 2 additions & 2 deletions test/version_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ defmodule GitOps.Test.VersionTest do
end

test "last valid non rc is found correctly without prefixes" do
versions = ["0.0.1", "0.1.0-rc0", "0.1.0", "0.2.0-alpha"]
versions = ["0.2.0-alpha", "0.1.0", "0.1.0-rc0", "0.0.1"]
last_rc = Version.last_valid_non_rc_version(versions, "")

assert last_rc == "0.1.0"
end

test "last valid non rc is found correctly with prefixes" do
versions = ["v0.0.1", "v0.1.0-rc0", "0.1.0", "0.2.0-alpha"]
versions = ["0.2.0-alpha", "0.1.0", "v0.1.0-rc0", "v0.0.1"]
last_rc = Version.last_valid_non_rc_version(versions, "v")

assert last_rc == "v0.0.1"
Expand Down