Skip to content

Commit

Permalink
Move edition comment
Browse files Browse the repository at this point in the history
  • Loading branch information
guicaulada committed Aug 23, 2023
1 parent ff6d13d commit 866309f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions pipelines/package_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,14 @@ func BuildPackage(ctx context.Context, d *dagger.Client, src *dagger.Directory,
)
if isEnterprise {
edition = "enterprise"
// If the user has manually set the edition flag, then override it with their selection.
// Temporary fix: to avoid creating a --grafana and a --enterprise package with a conflicting name, only allow
// overriding the 'edition' if we're building enterprise.
s, err := args.GrafanaOpts.Enterprise(ctx, src, d)
if err != nil {
return err
}
src = s
}

// If the user has manually set the edition flag, then override it with their selection.
if e := args.PackageOpts.Edition; e != "" {
edition = e
}
Expand Down

0 comments on commit 866309f

Please sign in to comment.