diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2022-02-18 12:43:59 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2022-02-18 15:06:58 +0100 |
| commit | a87be597af21b8f7000706b3ed4201022a9b7a8f (patch) | |
| tree | a15a5363dddefe56ad7251ddb7c8eefd559446f2 | |
| parent | b0eea007560a04e10d6e9f8bf6fee8b39e1deb34 (diff) | |
| download | hugo-a87be597af21b8f7000706b3ed4201022a9b7a8f.tar.gz hugo-a87be597af21b8f7000706b3ed4201022a9b7a8f.zip | |
modules: Add modules.Workspace config for Go 1.18
Sets `GOWORK` env var for Go 1.18.
Fixes #9525
| -rw-r--r-- | docs/content/en/hugo-modules/configuration.md | 4 | ||||
| -rw-r--r-- | modules/client.go | 1 | ||||
| -rw-r--r-- | modules/config.go | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/content/en/hugo-modules/configuration.md b/docs/content/en/hugo-modules/configuration.md index fc57f774f..73bb0eb4f 100644 --- a/docs/content/en/hugo-modules/configuration.md +++ b/docs/content/en/hugo-modules/configuration.md @@ -23,6 +23,7 @@ proxy = "direct" noProxy = "none" private = "*.*" replacements = "" +workspace = "" {{< /code-toggle >}} @@ -41,6 +42,9 @@ noProxy private : Comma separated glob list matching paths that should be treated as private. +workspace {{< new-in "0.83.0" >}} +The workspace file to use. This enables Go workspace mode. Note that this can also be set via OS env, e.g. `export HUGO_MODULE_WORKSPACE=/my/hugo.work` This only works with Go 1.18+. + replacements {{< new-in "0.77.0" >}} : A comma separated (or a slice) list of module path to directory replacement mapping, e.g. `github.com/bep/myprettytheme -> ../..,github.com/bep/shortcodes -> /some/path`. This is mostly useful for temporary locally development of a module, and then it makes sense to set it as an OS environment variable, e.g: `env HUGO_MODULE_REPLACEMENTS="github.com/bep/myprettytheme -> ../.."`. Any relative path is relate to [themesDir](https://gohugo.io/getting-started/configuration/#all-configuration-settings), and absolute paths are allowed. diff --git a/modules/client.go b/modules/client.go index 17e149ecf..fe0abc462 100644 --- a/modules/client.go +++ b/modules/client.go @@ -90,6 +90,7 @@ func NewClient(cfg ClientConfig) *Client { "GOPRIVATE", mcfg.Private, "GONOPROXY", mcfg.NoProxy, "GOPATH", cfg.CacheDir, + "GOWORK", mcfg.Workspace, // Requires Go 1.18, see https://tip.golang.org/doc/go1.18 // GOCACHE was introduced in Go 1.15. This matches the location derived from GOPATH above. "GOCACHE", filepath.Join(cfg.CacheDir, "pkg", "mod"), ) diff --git a/modules/config.go b/modules/config.go index ac9eadd37..4b39636cd 100644 --- a/modules/config.go +++ b/modules/config.go @@ -295,6 +295,12 @@ type Config struct { NoProxy string // Configures GOPRIVATE. Private string + + // Set the workspace file to use, e.g. hugo.work. + // Enables Go "Workspace" mode. + // Requires Go 1.18+ + // See https://tip.golang.org/doc/go1.18 + Workspace string } // hasModuleImport reports whether the project config have one or more |