From 5379233824861091c81fee18a4b94167e08fcfa6 Mon Sep 17 00:00:00 2001
From: sfletc <steveofbrisbane@gmail.com>
Date: Mon, 29 Apr 2024 10:01:50 +1000
Subject: [PATCH] fixes

---
 .github/workflows/build-binaries.yml | 56 +++++++++++++++-------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index a4cdd5b..4ce8a01 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -10,19 +10,42 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Create release
+        if: startsWith(github.ref, 'refs/tags/')
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+  build:
+    needs: release
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - os: linux
+          - os: ubuntu-latest
+            target: linux
             arch: amd64
             asset_name: scramAligner-linux-amd64
-          - os: windows
+          - os: windows-latest
+            target: windows
             arch: amd64
             asset_name: scramAligner-windows-amd64
-          - os: darwin
+          - os: macos-latest
+            target: darwin
             arch: amd64
             asset_name: scramAligner-macos-intel
-          - os: darwin
+          - os: macos-latest
+            target: darwin
             arch: arm64
             asset_name: scramAligner-macos-arm
     steps:
@@ -36,7 +59,7 @@ jobs:
 
       - name: Build Go app
         run: |
-          GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o ${{ matrix.asset_name }}
+          GOOS=${{ matrix.target }} GOARCH=${{ matrix.arch }} go build -o ${{ matrix.asset_name }}
 
       - name: Package Python scripts
         run: |
@@ -44,31 +67,12 @@ jobs:
           cp -r scramScripts/scram2Plot release/
           mv ${{ matrix.asset_name }} release/
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.asset_name }}
-          path: release
-
-      - name: Create release
-        if: startsWith(github.ref, 'refs/tags/')
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false
-
-      - name: Upload release assets
-        if: startsWith(github.ref, 'refs/tags/')
+      - name: Upload release asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ needs.release.outputs.upload_url }}
           asset_path: release/${{ matrix.asset_name }}
           asset_name: ${{ matrix.asset_name }}.tar.gz
           asset_content_type: application/gzip
\ No newline at end of file