From 9f5a92078a3f388b52d597b5a59af5c933a112d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 3 May 2019 09:16:58 +0200 Subject: Add Hugo Modules This commit implements Hugo Modules. This is a broad subject, but some keywords include: * A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project. * A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects. * Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running. * Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions. * A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`. All of the above is backed by Go Modules. Fixes #5973 Fixes #5996 Fixes #6010 Fixes #5911 Fixes #5940 Fixes #6074 Fixes #6082 Fixes #6092 --- magefile.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'magefile.go') diff --git a/magefile.go b/magefile.go index 3b74a7e94..d0b7c8d98 100644 --- a/magefile.go +++ b/magefile.go @@ -143,20 +143,31 @@ func Check() { mg.Deps(TestRace) } +func testGoFlags() string { + if isCI() { + return "" + } + + return "-test.short" +} + // Run tests in 32-bit mode // Note that we don't run with the extended tag. Currently not supported in 32 bit. func Test386() error { - return sh.RunWith(map[string]string{"GOARCH": "386"}, goexe, "test", "./...") + env := map[string]string{"GOARCH": "386", "GOFLAGS": testGoFlags()} + return sh.RunWith(env, goexe, "test", "./...") } // Run tests func Test() error { - return sh.Run(goexe, "test", "./...", "-tags", buildTags()) + env := map[string]string{"GOFLAGS": testGoFlags()} + return sh.RunWith(env, goexe, "test", "./...", "-tags", buildTags()) } // Run tests with race detector func TestRace() error { - return sh.Run(goexe, "test", "-race", "./...", "-tags", buildTags()) + env := map[string]string{"GOFLAGS": testGoFlags()} + return sh.RunWith(env, goexe, "test", "-race", "./...", "-tags", buildTags()) } // Run gofmt linter @@ -296,6 +307,10 @@ func isGoLatest() bool { return strings.Contains(runtime.Version(), "1.11") } +func isCI() bool { + return os.Getenv("CI") != "" +} + func buildTags() string { // To build the extended Hugo SCSS/SASS enabled version, build with // HUGO_BUILD_TAGS=extended mage install etc. -- cgit v1.2.3