Merge 5ee663c9dc22c00889f6af63ec5bdb3757ebb703 into 5254df53dc6d6e69b4f043e8d232d05b16ceb548

.github/workflows/build.yml

@@ -73,9 +73,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-amd64-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go-
+          ${{ runner.os }}-go-amd64
     - name: "Build"
       run: make build_linux
     - name: Upload
@@ -105,16 +105,20 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-armv7-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go-
+          ${{ runner.os }}-go-armv7
     - name: "Build"
-      run: make build_linux_arm
+      env:
+        CC: arm-linux-gnueabihf-gcc
+        GOARCH: arm
+        GOARM: 7
+      run: make build_linux
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
         name: linux_arm
-        path: _output/linux_arm/yarr
+        path: _output/linux/yarr
 
   build_linux-arm64:
     name: Build for Linux ARM64
@@ -137,16 +141,19 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-arm64-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go-
+          ${{ runner.os }}-go-arm64
     - name: "Build"
-      run: make build_linux_arm64
+      env:
+        CC: aarch64-linux-gnu-gcc
+        GOARCH: arm64
+      run: make build_linux
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
         name: linux_arm64
-        path: _output/linux_arm64/yarr
+        path: _output/linux/yarr
 
   create_release:
     name: Create Release

makefile

@@ -2,8 +2,6 @@ VERSION=2.4
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
 GO_LDFLAGS = -s -w -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
-CC_ARM    ?= arm-linux-gnueabihf-gcc
-CC_ARM64  ?= aarch64-linux-gnu-gcc
 
 export GOARCH      ?= amd64
 export CGO_ENABLED  = 1
@@ -22,20 +20,6 @@ build_linux:
 	mkdir -p _output/linux
 	GOOS=linux go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr ./cmd/yarr
 
-build_linux_arm:
-	mkdir -p _output/linux_arm
-	CC=$(CC_ARM) \
-	GOOS=linux \
-	GOARCH=arm GOARM=7 \
-	go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux_arm/yarr ./cmd/yarr
-
-build_linux_arm64:
-	mkdir -p _output/linux_arm64
-	CC=$(CC_ARM64) \
-	GOOS=linux \
-	GOARCH=arm64 \
-	go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux_arm64/yarr ./cmd/yarr
-
 build_windows:
 	mkdir -p _output/windows
 	go run ./cmd/generate_versioninfo -version "$(VERSION)" -outfile src/platform/versioninfo.rc