Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
iignatevich authored and davidferlay committed Nov 28, 2024
1 parent 767ecf5 commit ce14588
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
11 changes: 1 addition & 10 deletions actionSync.go
Original file line number Diff line number Diff line change
Expand Up @@ -519,16 +519,7 @@ func (s *SyncAction) getResourcesMaps() (map[string]*sync.OrderedMap[bool], map[
var priorityOrder []string
for _, dep := range plasmaCompose.Dependencies {
pkg := dep.ToPackage(dep.Name)
tag := pkg.GetTag()
branch := pkg.GetRef()
var version string
if tag != "" {
version = tag
} else if branch != "" {
version = branch
} else {
return nil, nil, errors.New("can't find package version")
}
version := pkg.GetTarget()

packagePathMap[dep.Name] = filepath.Join(s.packagesDir, pkg.GetName(), version)
priorityOrder = append(priorityOrder, dep.Name)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.2
require (
github.com/cespare/xxhash/v2 v2.3.0
github.com/go-git/go-git/v5 v5.12.0
github.com/launchrctl/compose v0.10.0
github.com/launchrctl/compose v0.11.0
github.com/launchrctl/keyring v0.2.5
github.com/launchrctl/launchr v0.16.4
github.com/sosedoff/ansible-vault-go v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/launchrctl/compose v0.10.0 h1:FlLg4BM9dElRYs2T2cZQxyMKLJdqL3jkXh6qFJqImFk=
github.com/launchrctl/compose v0.10.0/go.mod h1:9BHMgw95xJlc4junJFIzenfcr87hw98Um+LN6s3QMt8=
github.com/launchrctl/compose v0.11.0 h1:tKDTqNXolN8LmYpghoGMmAmJqFOtTUy9D3jFvb2KJuM=
github.com/launchrctl/compose v0.11.0/go.mod h1:GRSfgFa34xMgaE767fwLv0xr5vN2F1odNVK57bnx+oE=
github.com/launchrctl/keyring v0.2.5 h1:NbGquLfWNwydL0+oHV2ltUj9Dj+W+2v5PeqFBHaIEKY=
github.com/launchrctl/keyring v0.2.5/go.mod h1:uBHC4ekh6hJikEA8YGlY1LDCi3iF3RBCvty0E4oZebA=
github.com/launchrctl/launchr v0.16.4 h1:uVbRLZZQuTGhjDBN8kLpdPGeZZkpBjiiSjCxDEmeM6g=
Expand Down

0 comments on commit ce14588

Please sign in to comment.