Skip to content

Commit

Permalink
Honor build_tags in config
Browse files Browse the repository at this point in the history
  • Loading branch information
newly12 committed Sep 12, 2024
1 parent 2166b11 commit 6f23c51
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
20 changes: 20 additions & 0 deletions .chloggen/fixbuildtags.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: builder

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Honor build_tags in config

# One or more tracking issues or pull requests related to the change
issues: [11156]

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
4 changes: 4 additions & 0 deletions cmd/builder/internal/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const (
distributionOutputPathFlag = "output-path"
distributionGoFlag = "go"
distributionModuleFlag = "module"
distributionBuildTagsFlag = "build-tags"
verboseFlag = "verbose"
)

Expand Down Expand Up @@ -209,5 +210,8 @@ func applyCfgFromFile(flags *flag.FlagSet, cfgFromFile builder.Config) {
if !flags.Changed(distributionModuleFlag) && cfgFromFile.Distribution.Module != "" {
cfg.Distribution.Module = cfgFromFile.Distribution.Module
}
if !flags.Changed(distributionBuildTagsFlag) && cfgFromFile.Distribution.BuildTags != "" {
cfg.Distribution.BuildTags = cfgFromFile.Distribution.BuildTags

Check warning on line 214 in cmd/builder/internal/command.go

View check run for this annotation

Codecov / codecov/patch

cmd/builder/internal/command.go#L214

Added line #L214 was not covered by tests
}
cfg.Distribution.DebugCompilation = cfgFromFile.Distribution.DebugCompilation
}

0 comments on commit 6f23c51

Please sign in to comment.