Fix mage vs make issues

And remove Makefile ... for good. Fixes gohugoio#3969
mufidtk · Oct 18, 2017 · ad5ef43 · ad5ef43
1 parent 5109ed5
commit ad5ef43
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 90 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 defaults: &defaults
   working_directory: /go/src/github.com/gohugoio
   docker:
-      - image: bepsays/ci-goreleaser:0.34.2-2
+      - image: bepsays/ci-goreleaser:0.34.2-5
 
 version: 2
 jobs:
@@ -14,8 +14,8 @@ jobs:
             command: |
                 git clone [email protected]:gohugoio/hugoDocs.git
                 cd hugo
-                make vendor
-                make check
+                mage vendor
+                mage check
       - persist_to_workspace:
           root: .
           paths: .

diff --git a/Makefile b/Makefile
diff --git a/magefile.go b/magefile.go
@@ -94,7 +94,10 @@ func Docker() error {
 
 // Run tests and linters
 func Check() {
-	mg.Deps(TestRace, Test386, Fmt, Vet)
+	mg.Deps(Test386, Fmt, Vet)
+	// don't run two tests in parallel, they saturate the CPUs anyway, and running two
+	// causes memory issues in CI.
+	mg.Deps(TestRace)
 }
 
 // Run tests in 32-bit mode