fix(config): avoid deprecated bin warning with entrypoint (#890)
This commit is contained in:
+11
-3
@@ -227,10 +227,13 @@ func InitConfig(path string, cmdArgs map[string]TomlInfo) (cfg *Config, err erro
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = ret.preprocess(cmdArgs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
warnDeprecatedBin(ret)
|
||||
|
||||
err = ret.preprocess(cmdArgs)
|
||||
return ret, err
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func writeDefaultConfig() (string, error) {
|
||||
@@ -587,7 +590,7 @@ func (c *Config) preprocess(args map[string]TomlInfo) error {
|
||||
for idx, expr := range c.Build.ExcludeRegex {
|
||||
re, err := regexp.Compile(expr)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to compile regex %s", expr)
|
||||
return fmt.Errorf("failed to compile regex %q: %w", expr, err)
|
||||
}
|
||||
regexCompiled[idx] = re
|
||||
}
|
||||
@@ -785,5 +788,10 @@ func warnDeprecatedBin(cfg *Config) {
|
||||
if cfg.Build.Bin == "" || len(cfg.Build.Entrypoint) > 0 {
|
||||
return
|
||||
}
|
||||
|
||||
if cfg.Build.Bin != "" && len(cfg.Build.Entrypoint) > 0 {
|
||||
return
|
||||
}
|
||||
|
||||
fmt.Fprintln(os.Stderr, "[warning] build.bin is deprecated; set build.entrypoint instead")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user