chore: sync with danielpaulus main

.github/workflows/real-device.yml

@@ -41,11 +41,12 @@ jobs:
           rm testdata/test1*
 
       - name: upload the macos build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signed-wda
           path: testdata/wda-signed.ipa
           retention-days: 1
+          overwrite: true
 
   test_on_windows:
     runs-on: windows-latest
@@ -64,7 +65,7 @@ jobs:
       - name: compile
         run: go build
       - name: Download mac signed wda from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: signed-wda
 
@@ -104,7 +105,7 @@ jobs:
           cache: true
 
       - name: Download mac release from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: signed-wda
 

.github/workflows/release.yml

@@ -26,18 +26,19 @@ jobs:
 
       - name: Build
         run: |
-          ((Get-Content -path main.go -Raw) -replace "local-build","${{ steps.create_release.outputs.current_tag }}") | Set-Content -Path main.go  
+          ((Get-Content -path main.go -Raw) -replace "local-build","${{ steps.create_release.outputs.current_tag }}") | Set-Content -Path main.go
           mkdir bin
           go build -ldflags="-s -w" -o bin/ios.exe
           "${{ steps.create_release.outputs.current_tag }}" | Out-File -Encoding utf8NoBOM release_tag -NoNewline
           Compress-Archive -Path .\bin\ios.exe, release_tag -CompressionLevel Optimal -DestinationPath go-ios-windows.zip
 
       - name: upload the windows build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-build
           path: go-ios-windows.zip
           retention-days: 1
+          overwrite: true
 
   build_on_mac:
     runs-on: macos-latest
@@ -52,7 +53,7 @@ jobs:
           cache: true
 
       - name: Download win release from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: windows-build
           path: ./win-bin
@@ -75,11 +76,12 @@ jobs:
           zip -j go-ios-mac.zip bin/ios
 
       - name: upload the macos build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macos-build
           path: go-ios-mac.zip
           retention-days: 1
+          overwrite: true
 
   build_on_linux_and_release:
     runs-on: ubuntu-latest
@@ -94,7 +96,7 @@ jobs:
           cache: true
 
       - name: Download mac release from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: macos-build
           path: ./mac-bin
@@ -107,7 +109,7 @@ jobs:
           zip -j go-ios-mac.zip ios
 
       - name: Download windows release from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: windows-build
           path: ./win-bin
@@ -124,10 +126,12 @@ jobs:
         run: |
           sed -i 's/version \= \"local-build\"/version = \"${{ env.release_tag }}\"/' main.go
           mkdir bin
-          go build -ldflags="-s -w" -o bin/ios
+          GOARCH=arm64 go build -ldflags="-s -w" -o bin/ios-arm64
+          GOARCH=amd64 go build -ldflags="-s -w" -o bin/ios-amd64
+
           cp ./mac-bin/go-ios-mac.zip .
           cp ./win-bin/go-ios-win.zip .
-          zip -j go-ios-linux.zip bin/ios
+          zip -j go-ios-linux.zip bin/ios-arm64 bin/ios-amd64
 
       - uses: AButler/upload-release-assets@v2.0
         with:
@@ -143,11 +147,13 @@ jobs:
           mkdir ./npm_publish/dist/go-ios-darwin-amd64_darwin_amd64
           mkdir ./npm_publish/dist/go-ios-darwin-arm64_darwin_arm64
           mkdir ./npm_publish/dist/go-ios-linux-amd64_linux_amd64
+          mkdir ./npm_publish/dist/go-ios-linux-arm64_linux_arm64
           mkdir ./npm_publish/dist/go-ios-windows-amd64_windows_amd64
           cp ./mac-bin/ios ./npm_publish/dist/go-ios-darwin-amd64_darwin_amd64/ios
           cp ./mac-bin/ios ./npm_publish/dist/go-ios-darwin-arm64_darwin_arm64/ios
           cp ./win-bin/ios.exe ./npm_publish/dist/go-ios-windows-amd64_windows_amd64/ios.exe
-          cp ./bin/ios ./npm_publish/dist/go-ios-linux-amd64_linux_amd64/ios
+          cp ./bin/ios-amd64 ./npm_publish/dist/go-ios-linux-amd64_linux_amd64/ios
+          cp ./bin/ios-arm64 ./npm_publish/dist/go-ios-linux-arm64_linux_arm64/ios
           echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
           cd npm_publish
           sed -i 's/\"local-build\"/\"${{ env.release_tag }}\"/' package.json

Makefile

@@ -9,30 +9,19 @@
 GO_IOS_BINARY_NAME=ios
 NCM_BINARY_NAME=go-ncm
 
+# Define only if compiling for system different than our own
+OS=
+ARCH=
 
-# Detect the system architecture
-UNAME_S := $(shell uname -s)
-UNAME_M := $(shell uname -m)
-
-# Default GOARCH value
-GOARCH := amd64
-
-# Set GOARCH based on the detected architecture
-ifeq ($(UNAME_M),x86_64)
-    GOARCH := amd64
-else ifeq ($(UNAME_M),armv7l)
-    GOARCH := arm
-else ifeq ($(UNAME_M),aarch64)
-    GOARCH := arm64
-# Add more architecture mappings as needed
-endif
+# Prepend each non-empty OS/ARCH definition to "go" command
+GOEXEC=$(strip $(foreach v,OS ARCH,$(and $($v),GO$v=$($v) )) go)
 
 # Build the Go program
 build:
-	@go work use .
-	@GOARCH=$(GOARCH) go build -o $(GO_IOS_BINARY_NAME) ./main.go
-	@go work use ./ncm
-	@CGO_ENABLED=1 GOARCH=$(GOARCH) go build -o $(NCM_BINARY_NAME) ./cmd/cdc-ncm/main.go
+	@$(GOEXEC) work use .
+	@$(GOEXEC) build -o $(GO_IOS_BINARY_NAME) ./main.go
+	@$(GOEXEC) work use ./ncm
+	@CGO_ENABLED=1 $(GOEXEC) build -o $(NCM_BINARY_NAME) ./cmd/cdc-ncm/main.go
 
 # Run the Go program with sudo
 run: build