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

Merge error? #1095

Merged
merged 1 commit into from
Oct 4, 2018
Merged

Merge error? #1095

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
7 changes: 3 additions & 4 deletions pkg/skaffold/schema/v1alpha3/config.go
View file
Original file line number Diff line number Diff line change
@@ -201,10 +201,9 @@ type HelmConventionConfig struct {
// Artifact represents items that need to be built, along with the context in which
// they should be built.
type Artifact struct {
ImageName string `yaml:"imageName"`
Workspace string `yaml:"workspace,omitempty"`
ArtifactType `yaml:",inline"`
StructureTestFiles []string `yaml:"structureTestFiles"`
ImageName string `yaml:"imageName"`
Workspace string `yaml:"workspace,omitempty"`
ArtifactType `yaml:",inline"`
}

// Profile is additional configuration that overrides default