nixos-contrib/ficsit-cli-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

fix: deterministic resolving order

Browse source
This commit is contained in:
mircearoata 2023-06-12 11:47:04 +02:00
parent 815c8a3c57
commit 7f3e6382c1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/dependency_resolver.go
View file

@ -141,6 +141,10 @@ func (r *resolvingInstance) Step() error {
return errors.Wrap(err, "failed resolving mod dependencies") return errors.Wrap(err, "failed resolving mod dependencies")
} }
sort.Slice(dependencies.Mods, func(i, j int) bool {
return dependencies.Mods[i].Mod_reference < dependencies.Mods[j].Mod_reference
})
for _, mod := range dependencies.Mods { for _, mod := range dependencies.Mods {
modVersions := make([]ModVersion, len(mod.Versions)) modVersions := make([]ModVersion, len(mod.Versions))
for i, version := range mod.Versions { for i, version := range mod.Versions {

2
cli/resolving_test.go
View file

@ -41,7 +41,7 @@ func TestProfileResolution(t *testing.T) {
}, },
}).Resolve(resolver, nil, math.MaxInt) }).Resolve(resolver, nil, math.MaxInt)
testza.AssertEqual(t, "failed resolving profile dependencies: mod RefinedRDLib version 1.0.6 does not match constraint ^1.0.7", err.Error()) testza.AssertEqual(t, "failed resolving profile dependencies: failed resolving dependencies. requires different versions of RefinedRDLib", err.Error())
_, err = (&Profile{ _, err = (&Profile{
Name: DefaultProfileName, Name: DefaultProfileName,