Add Mac ARM64 build

KillianMeersman · Feb 28, 2024 · 91f5e50 · 91f5e50
1 parent 76134b1
commit 91f5e50
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,8 +14,8 @@ jobs:
         with:
             go-version: '^1.21.6'
       - run: |
-            GOOS=windows GOARCH=amd64 go build -buildvcs=false -o bin/supermake_windows_64.exe
-            GOOS=windows GOARCH=386 go build -buildvcs=false -o bin/supermake_windows_32.exe
+            GOOS=windows GOARCH=amd64 go build -buildvcs=false -o bin/supermake_windows_x64.exe
+            GOOS=windows GOARCH=386 go build -buildvcs=false -o bin/supermake_windows_x32.exe
       - name: 'Upload build artifacts'
         uses: actions/upload-artifact@v4
         with:
@@ -31,7 +31,8 @@ jobs:
           with:
             go-version: '^1.21.6'
         - run: |
-           GOOS=darwin GOARCH=amd64 go build -buildvcs=false -o bin/supermake_darwin_64
+           GOOS=darwin GOARCH=amd64 go build -buildvcs=false -o bin/supermake_mac_x64
+           GOOS=darwin GOARCH=arm64 go build -buildvcs=false -o bin/supermake_mac_arm64
         - name: 'Upload build artifacts'
           uses: actions/upload-artifact@v4
           with:
@@ -47,8 +48,8 @@ jobs:
         with:
           go-version: '^1.21.6'
       - run: |
-          GOOS=linux GOARCH=amd64 go build -buildvcs=false -o bin/supermake_linux_64
-          GOOS=linux GOARCH=386 go build -buildvcs=false -o bin/supermake_linux_32
+          GOOS=linux GOARCH=amd64 go build -buildvcs=false -o bin/supermake_linux_x64
+          GOOS=linux GOARCH=386 go build -buildvcs=false -o bin/supermake_linux_x32
       - name: 'Upload build artifacts'
         uses: actions/upload-artifact@v4
         with:

diff --git a/Supermake b/Supermake
@@ -2,17 +2,21 @@ export GOCACHE = /tmp/.cache
 
 .SHELL = sh -cex
 
-dist: test
-	mac:
-		echo 'Building mac binary'
-		GOOS=darwin GOARCH=amd64 go build -buildvcs=false -o bin/supermake_darwin_64
+dist:
+	mac_x64:
+		echo 'Building mac x64 binary'
+		GOOS=darwin GOARCH=amd64 go build -buildvcs=false -o bin/supermake_mac_x64
+
+	mac_arm64:
+		echo 'Building mac ARM64 binary'
+		GOOS=darwin GOARCH=arm64 go build -buildvcs=false -o bin/supermake_mac_arm64
 
 	linux:
 		echo 'Building linux binaries'
-		GOOS=linux GOARCH=amd64 go build -buildvcs=false -o bin/supermake_linux_64
-		GOOS=linux GOARCH=386 go build -buildvcs=false -o bin/supermake_linux_32
+		GOOS=linux GOARCH=amd64 go build -buildvcs=false -o bin/supermake_linux_x64
+		GOOS=linux GOARCH=386 go build -buildvcs=false -o bin/supermake_linux_x32
 
 	windows:
 		echo 'Building windows binaries'
-		GOOS=windows GOARCH=amd64 go build -buildvcs=false -o bin/supermake_windows_64.exe
-		GOOS=windows GOARCH=386 go build -buildvcs=false -o bin/supermake_windows_32.exe
+		GOOS=windows GOARCH=amd64 go build -buildvcs=false -o bin/supermake_windows_x64.exe
+		GOOS=windows GOARCH=386 go build -buildvcs=false -o bin/supermake_windows_x32.exe