Skip to content

Commit

Permalink
swallow error on no non-magefiles (magefile#265)
Browse files Browse the repository at this point in the history
* swallow error on no non-magefiles

This fixes magefile#262. go list will error out if there are no go files. So we ignore that specific error.
  • Loading branch information
natefinch authored and arturtorun committed Oct 12, 2019
1 parent f87ede7 commit fdb0612
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ branches:
# library, I'm not going to worry about older versions for now.
go:
- tip
- 1.13.x
- 1.12.x
- 1.11.x
- 1.10.x
Expand Down
38 changes: 23 additions & 15 deletions mage/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mage

import (
"bytes"
"crypto/sha1"
"errors"
"flag"
Expand Down Expand Up @@ -339,13 +340,17 @@ func Invoke(inv Invocation) int {
if inv.HashFast {
debug.Println("user has set MAGEFILE_HASHFAST, so we'll ignore GOCACHE")
} else {
if s, err := internal.OutputDebug(inv.GoCmd, "env", "GOCACHE"); err == nil {
// if GOCACHE exists, always rebuild, so we catch transitive
// dependencies that have changed.
if s != "" {
debug.Println("go build cache exists, will ignore any compiled binary")
useCache = true
}
s, err := internal.OutputDebug(inv.GoCmd, "env", "GOCACHE")
if err != nil {
errlog.Printf("failed to run %s env GOCACHE: %s", inv.GoCmd, err)
return 1
}

// if GOCACHE exists, always rebuild, so we catch transitive
// dependencies that have changed.
if s != "" {
debug.Println("go build cache exists, will ignore any compiled binary")
useCache = true
}
}

Expand Down Expand Up @@ -442,17 +447,22 @@ func Magefiles(magePath, goos, goarch, goCmd string, stderr io.Writer, isDebug b
}

debug.Println("getting all non-mage files in", magePath)

// // first, grab all the files with no build tags specified.. this is actually
// // our exclude list of things without the mage build tag.
cmd := exec.Command(goCmd, "list", "-e", "-f", `{{join .GoFiles "||"}}`)
cmd.Env = env
if isDebug {
cmd.Stderr = stderr
}
buf := &bytes.Buffer{}
cmd.Stderr = buf
cmd.Dir = magePath
b, err := cmd.Output()
if err != nil {
return fail(fmt.Errorf("failed to list non-mage gofiles: %v", err))
stderr := buf.String()
// if the error is "cannot find module", that can mean that there's no
// non-mage files, which is fine, so ignore it.
if !strings.Contains(stderr, "cannot find module for path") {
return fail(fmt.Errorf("failed to list non-mage gofiles: %v: %s", err, stderr))
}
}
list := strings.TrimSpace(string(b))
debug.Println("found non-mage files", list)
Expand All @@ -467,13 +477,11 @@ func Magefiles(magePath, goos, goarch, goCmd string, stderr io.Writer, isDebug b
cmd = exec.Command(goCmd, "list", "-tags=mage", "-e", "-f", `{{join .GoFiles "||"}}`)
cmd.Env = env

if isDebug {
cmd.Stderr = stderr
}
buf.Reset()
cmd.Dir = magePath
b, err = cmd.Output()
if err != nil {
return fail(fmt.Errorf("failed to list mage gofiles: %v", err))
return fail(fmt.Errorf("failed to list mage gofiles: %v: %s", err, buf.Bytes()))
}

list = strings.TrimSpace(string(b))
Expand Down

0 comments on commit fdb0612

Please sign in to comment.