Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove variant from base tag #60

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Remove variant from base tag #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion versioneer/base_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var _ = Describe("BaseContainerName", func() {
BeforeEach(func() {
id = "master"
registryAndOrg = "quay.io/kairos"
expectedName = "quay.io/kairos/opensuse:leap-15.5-standard-amd64-generic-master"
expectedName = "quay.io/kairos/opensuse:leap-15.5-amd64-generic-master"
})
It("returns the name", func() {
name, err := artifact.BaseContainerName(registryAndOrg, id)
Expand Down
9 changes: 8 additions & 1 deletion versioneer/versioneer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,14 @@
}

func (a *Artifact) BaseTag() (string, error) {
return a.commonName()
if err := a.Validate(); err != nil {
return "", err
}

Check warning on line 144 in versioneer/versioneer.go

View check run for this annotation

Codecov / codecov/patch

versioneer/versioneer.go#L143-L144 

Added lines #L143 - L144 were not covered by tests

result := fmt.Sprintf("%s-%s-%s",
a.FlavorRelease, a.Arch, a.Model)

return result, nil
}

func (a *Artifact) Tag() (string, error) {
Expand Down