Skip to content

Commit

Permalink
Fixup molinillo_solver
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota committed Feb 20, 2020
1 parent f7b0fce commit e9a0f2b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions src/dependency.cr
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@ module Shards
yield
end
end

def prerelease?
Versions.prerelease? version
end


def refs
branch || tag || commit
end
Expand Down
6 changes: 3 additions & 3 deletions src/molinillo_solver.cr
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ module Shards
base = Molinillo::DependencyGraph(Dependency, Dependency).new
if locks = @locks
locks.each do |lock|
if version = lock["version"]?
if version = lock.version?
dep = deps.find { |d| d.name == lock.name }
next if dep && !Versions.matches?(version, dep.version)
end

if commit = lock["commit"]?
if commit = lock.commit
resolver = Shards.find_resolver(lock)
spec = resolver.spec(commit)
lock["version"] = "#{spec.version}+git.commit.#{commit}"
lock.version = "#{spec.version}+git.commit.#{commit}"
end
base.add_vertex(lock.name, lock, true)
end
Expand Down

0 comments on commit e9a0f2b

Please sign in to comment.