diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2024-02-07 18:24:02 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2024-02-07 20:38:13 +0100 |
| commit | 0257eb50a428f9a77179600b65f8a3d7f411f48d (patch) | |
| tree | e73e069904844846d09645bc36d1e57a498e989c /config | |
| parent | a65622a13e2f20fc8746ccdc89cc6a731635a29e (diff) | |
Avoid impporting deploy from config when nodeploy tag is set
Test:
```
go list -tags nodeploy ./... | grep deploy
```
Fixes #12009
Diffstat (limited to 'config')
| -rw-r--r-- | config/allconfig/allconfig.go | 6 | ||||
| -rw-r--r-- | config/allconfig/alldecoders.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/allconfig/allconfig.go b/config/allconfig/allconfig.go index 4771f5a72..f22fe8a7e 100644 --- a/config/allconfig/allconfig.go +++ b/config/allconfig/allconfig.go @@ -37,7 +37,7 @@ import ( "github.com/gohugoio/hugo/config/privacy" "github.com/gohugoio/hugo/config/security" "github.com/gohugoio/hugo/config/services" - "github.com/gohugoio/hugo/deploy" + "github.com/gohugoio/hugo/deploy/deployconfig" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/langs" "github.com/gohugoio/hugo/markup/markup_config" @@ -141,8 +141,8 @@ type Config struct { // <docsmeta>{"refs": ["config:languages:menus"] }</docsmeta> Menus *config.ConfigNamespace[map[string]navigation.MenuConfig, navigation.Menus] `mapstructure:"-"` - // The deployment configuration section contains for hugo deploy. - Deployment deploy.DeployConfig `mapstructure:"-"` + // The deployment configuration section contains for hugo deployconfig. + Deployment deployconfig.DeployConfig `mapstructure:"-"` // Module configuration. Module modules.Config `mapstructure:"-"` diff --git a/config/allconfig/alldecoders.go b/config/allconfig/alldecoders.go index 5ab76dec5..9c1d08144 100644 --- a/config/allconfig/alldecoders.go +++ b/config/allconfig/alldecoders.go @@ -25,7 +25,7 @@ import ( "github.com/gohugoio/hugo/config/privacy" "github.com/gohugoio/hugo/config/security" "github.com/gohugoio/hugo/config/services" - "github.com/gohugoio/hugo/deploy" + "github.com/gohugoio/hugo/deploy/deployconfig" "github.com/gohugoio/hugo/langs" "github.com/gohugoio/hugo/markup/markup_config" "github.com/gohugoio/hugo/media" @@ -333,7 +333,7 @@ var allDecoderSetups = map[string]decodeWeight{ key: "deployment", decode: func(d decodeWeight, p decodeConfig) error { var err error - p.c.Deployment, err = deploy.DecodeConfig(p.p) + p.c.Deployment, err = deployconfig.DecodeConfig(p.p) return err }, }, |