Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,12 @@
// SNAPSHOT creates a snapshot build.
func (Build) Local() error {
env := environMap()
<<<<<<< HEAD

Check failure on line 631 in magefile.go

View workflow job for this annotation

GitHub Actions / lint (linux)

expected statement, found '<<' (and 2 more errors)
=======
if isFIPS() {
addFIPSEnvVars(env)
}
>>>>>>> 693bd7b (re-enable CGO and buildmode pie (#5715))
outFile := filepath.Join("bin", binaryName)
if runtime.GOOS == "windows" {
outFile = filepath.Join("bin", binaryExe)
Expand Down
Loading