WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit a092090

Browse files
committed
Remove Elixir version dedup
1 parent aebab00 commit a092090

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

lib/bob/job/docker_checker.ex

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -318,28 +318,8 @@ defmodule Bob.Job.DockerChecker do
318318
|> Stream.filter(&build_elixir_ref?/1)
319319
|> Enum.sort(&cmp_elixir_tags/2)
320320

321-
versions =
322-
all_builds
323-
|> Enum.reject(fn {_elixir, otp} -> otp end)
324-
|> Enum.map(fn {elixir, _otp} -> elixir end)
325-
|> Enum.dedup_by(&dedup_elixir_ref_by/1)
326-
|> MapSet.new()
327-
328321
all_builds
329322
|> Stream.reject(fn {_elixir, otp} -> otp == nil end)
330-
|> Stream.filter(fn {elixir, _otp} -> elixir in versions end)
331-
end
332-
333-
defp dedup_elixir_ref_by("v" <> version) do
334-
version
335-
|> String.split(["-"])
336-
|> List.first()
337-
|> String.split(["."])
338-
|> Enum.take(2)
339-
end
340-
341-
defp dedup_elixir_ref_by(other) do
342-
other
343323
end
344324

345325
def elixir_tags() do
@@ -419,7 +399,7 @@ defmodule Bob.Job.DockerChecker do
419399
defp skip_elixir_for_erlang?(_erlang), do: false
420400

421401
defp skip_elixir?(elixir) do
422-
Version.compare(elixir, "1.10.0-0") == :lt
402+
Version.compare(normalize_version(elixir), "1.10.0-0") == :lt
423403
end
424404

425405
def manifest() do

0 commit comments

Comments
 (0)