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

do not fail fast, update test message

Browse source
This commit is contained in:
Vilsol 2022-05-02 23:31:23 +03:00
parent 79a981b15d
commit 3c4837069d
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/push.yaml vendored
View file

@ -53,6 +53,7 @@ jobs:
test: test:
name: Test name: Test
strategy: strategy:
fail-fast: false
matrix: matrix:
os: [ubuntu-latest, windows-latest] os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

6
cli/dependency_resolver.go
View file

@ -75,7 +75,11 @@ func (r *resolvingInstance) Step() error {
smlVersionConstraint, _ := semver.NewConstraint(constraint) smlVersionConstraint, _ := semver.NewConstraint(constraint)
if existingSML, ok := r.OutputLock[id]; ok { if existingSML, ok := r.OutputLock[id]; ok {
if !smlVersionConstraint.Check(semver.MustParse(existingSML.Version)) { if !smlVersionConstraint.Check(semver.MustParse(existingSML.Version)) {
return errors.New("failed resolving dependencies. requires different versions of " + id) return errors.Errorf("mod %s version %s does not match constraint %s",
id,
existingSML.Version,
constraint,
)
} }
} }

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,