fix(build): set arch in magefile

DavidProdinger · Nov 25, 2024 · 8482824 · 8482824
1 parent e8f614b
commit 8482824
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -45,7 +45,7 @@ jobs:
           sudo apt update && sudo apt -y install make pkg-config rubygems && sudo gem install fpm
 
       - name: Build binary
-        run: VERSION=${PACKAGE_VERSION} GOARCH=${{ matrix.arch }} go run mage.go build
+        run: VERSION=${PACKAGE_VERSION} ARCH=${{ matrix.arch }} go run mage.go build
 
       - name: Build package
         run: |

diff --git a/magefile.go b/magefile.go
@@ -13,6 +13,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
@@ -56,7 +57,12 @@ func Format() error {
 }
 
 func Build() error {
-	if err := sh.RunV("go", "build", "-o", "build/coraza-spoa"); err != nil {
+	arch := os.Getenv("ARCH")
+	if arch == "" {
+		arch = runtime.GOARCH
+	}
+
+	if err := sh.RunWith(map[string]string{"GOARCH": arch}, "go", "build", "-o", "build/coraza-spoa"); err != nil {
 		return err
 	}
 	return nil