upload artifacts to push actions too

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: build
 
-on:
+on: push
-  push:
-    tags: ['v*', 'test*']
 
 jobs:
   build_macos:
@@ -18,7 +16,7 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -27,7 +25,7 @@ jobs:
     - name: "Build"
       run: make build_macos
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: macos
         path: _output/macos/yarr.app
@@ -45,7 +43,7 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -54,7 +52,7 @@ jobs:
     - name: "Build"
       run: make build_windows
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: windows
         path: _output/windows/yarr.exe
@@ -72,7 +70,7 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -81,27 +79,81 @@ jobs:
     - name: "Build"
       run: make build_linux
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: linux
         path: _output/linux/yarr
 
+  build_linux-arm:
+    name: Build for Linux ARM
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Install dependencies
+      run: >
+        sudo apt-get install -y
+        gcc-arm-linux-gnueabihf
+        libc6-armhf-cross
+    - name: "Checkout"
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: "Setup Go"
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.17'
+    - name: Cache Go Modules
+      uses: actions/cache@v4
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: "Build"
+      run: make build_linux_arm
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux_arm
+        path: _output/linux_arm/yarr
+
+  build_linux-arm64:
+    name: Build for Linux ARM64
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Install dependencies
+      run: >
+        sudo apt-get install -y
+        gcc-aarch64-linux-gnu
+        libc6-arm64-cross
+    - name: "Checkout"
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: "Setup Go"
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.17'
+    - name: Cache Go Modules
+      uses: actions/cache@v4
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: "Build"
+      run: make build_linux_arm64
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux_arm64
+        path: _output/linux_arm64/yarr
+
   create_release:
     name: Create Release
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.ref, 'test') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'test') }}
-    needs: [build_macos, build_windows, build_linux]
+    needs: [build_macos, build_windows, build_linux, build_linux-arm, build_linux-arm64]
     steps:
-    - name: Create Release
-      uses: actions/create-release@v1
-      id: create_release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: true
-          prerelease: true
     - name: Download Artifacts
       uses: actions/download-artifact@v4.1.7
       with:
@@ -111,34 +163,24 @@ jobs:
         ls -R
         chmod u+x macos/Contents/MacOS/yarr
         chmod u+x linux/yarr
+        chmod u+x linux_arm/yarr
+        chmod u+x linux_arm64/yarr
 
-        mv macos yarr.app     && zip -r yarr-macos.zip yarr.app
+        mv macos yarr.app && zip -r yarr-${GITHUB_REF_NAME}-macos64.zip yarr.app
-        mv windows/yarr.exe . && zip yarr-windows.zip yarr.exe
+        ( cd windows        && zip ../yarr-${GITHUB_REF_NAME}-windows64.zip yarr.exe )
-        mv linux/yarr .       && zip yarr-linux.zip yarr
+        ( cd linux          && zip ../yarr-${GITHUB_REF_NAME}-linux64.zip yarr )
-    - name: Upload MacOS
+        ( cd linux_arm      && zip ../yarr-${GITHUB_REF_NAME}-linux_arm.zip yarr )
-      uses: actions/upload-release-asset@v1
+        ( cd linux_arm64    && zip ../yarr-${GITHUB_REF_NAME}-linux_arm64.zip yarr )
+    - name: Upload Release
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          draft: true
-          asset_path: ./yarr-macos.zip
+          prerelease: true
-          asset_name: yarr-${{ github.ref }}-macos64.zip
+          files: |
-          asset_content_type: application/zip
+            yarr-${{ github.ref_name }}-macos64.zip
-    - name: Upload Windows
+            yarr-${{ github.ref_name }}-windows64.zip
-      uses: actions/upload-release-asset@v1
+            yarr-${{ github.ref_name }}-linux64.zip
-      env:
+            yarr-${{ github.ref_name }}-linux_arm.zip
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            yarr-${{ github.ref_name }}-linux_arm64.zip
-      with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./yarr-windows.zip
-          asset_name: yarr-${{ github.ref }}-windows64.zip
-          asset_content_type: application/zip
-    - name: Upload Linux
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./yarr-linux.zip
-          asset_name: yarr-${{ github.ref }}-linux64.zip
-          asset_content_type: application/zip

makefile

@@ -2,6 +2,8 @@ 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
@@ -20,6 +22,20 @@ 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