From cc702574451b63c642b404cfc2ee50f88776e17c Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Sun, 30 Mar 2025 14:00:45 -0700
Subject: [PATCH] update build workflows to simplify, -tags migrated_fynedo for
 appimage

---
 .github/workflows/build-appimage-compat.yml | 2 +-
 .github/workflows/build-appimage.yml        | 2 +-
 .github/workflows/build-macos-arm64.yml     | 3 ---
 .github/workflows/build-macos-x64.yml       | 5 +----
 .github/workflows/build-ubuntu-22.04.yml    | 3 ---
 .github/workflows/build-ubuntu-24.04.yml    | 3 ---
 .github/workflows/build-windows.yml         | 3 ---
 7 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-appimage-compat.yml b/.github/workflows/build-appimage-compat.yml
index 3c8577c..982962f 100644
--- a/.github/workflows/build-appimage-compat.yml
+++ b/.github/workflows/build-appimage-compat.yml
@@ -24,7 +24,7 @@ jobs:
       run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev desktop-file-utils
 
     - name: Build
-      run: go build
+      run: make build
 
     - name: make appimage
       run: |
diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index 1bc96c2..6715d6a 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -24,7 +24,7 @@ jobs:
       run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev desktop-file-utils libmfx1 libdvdnav4
 
     - name: Build
-      run: go build
+      run: make build
 
     - name: make appimage
       run: |
diff --git a/.github/workflows/build-macos-arm64.yml b/.github/workflows/build-macos-arm64.yml
index 8a017a7..e1669ad 100644
--- a/.github/workflows/build-macos-arm64.yml
+++ b/.github/workflows/build-macos-arm64.yml
@@ -31,9 +31,6 @@ jobs:
     - name: Setup path
       run: export C_INCLUDE_PATH=/usr/local/include:/opt/homebrew/include:$C_INCLUDE_PATH && export LIBRARY_PATH=/usr/local/lib:/opt/homebrew/lib:$LIBRARY_PATH
 
-    - name: Build
-      run: CGO_CFLAGS="-I/usr/local/include -I/opt/homebrew/include" CGO_LDFLAGS="-L/usr/local/lib -L/opt/homebrew/lib" go build
-
     - name: Install Fyne tool
       run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
diff --git a/.github/workflows/build-macos-x64.yml b/.github/workflows/build-macos-x64.yml
index 5d97b6d..51f958f 100644
--- a/.github/workflows/build-macos-x64.yml
+++ b/.github/workflows/build-macos-x64.yml
@@ -31,13 +31,10 @@ jobs:
     - name: Setup path
       run: export C_INCLUDE_PATH=/usr/local/include:/opt/homebrew/include:$C_INCLUDE_PATH && export LIBRARY_PATH=/usr/local/lib:/opt/homebrew/lib:$LIBRARY_PATH
 
-    - name: Build
-      run: CGO_CFLAGS="-I/usr/local/include -I/opt/homebrew/include" CGO_LDFLAGS="-L/usr/local/lib -L/opt/homebrew/lib" go build
-
     - name: Install Fyne tool
       run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
-    - name: Package app bundles
+    - name: Build and package app bundles
       run: >
         make package_macos &&
         cp -r Supersonic.app Supersonic.app.2 &&
diff --git a/.github/workflows/build-ubuntu-22.04.yml b/.github/workflows/build-ubuntu-22.04.yml
index 2e4d48b..33b8a6a 100644
--- a/.github/workflows/build-ubuntu-22.04.yml
+++ b/.github/workflows/build-ubuntu-22.04.yml
@@ -23,9 +23,6 @@ jobs:
     - name: Install dependencies
       run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev
 
-    - name: Build
-      run: go build
-
     - name: Install Fyne tool
       run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
diff --git a/.github/workflows/build-ubuntu-24.04.yml b/.github/workflows/build-ubuntu-24.04.yml
index b2402e3..53c0e83 100644
--- a/.github/workflows/build-ubuntu-24.04.yml
+++ b/.github/workflows/build-ubuntu-24.04.yml
@@ -23,9 +23,6 @@ jobs:
     - name: Install dependencies
       run: sudo apt update && sudo apt install libmpv-dev gcc libegl1-mesa-dev xorg-dev
 
-    - name: Build
-      run: go build
-
     - name: Install Fyne tool
       run: go install fyne.io/fyne/v2/cmd/fyne@latest
 
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 1d8e7dd..7775e3d 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -36,9 +36,6 @@ jobs:
         pacman -Syu &&
         pacman --noconfirm -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-mpv
 
-    - name: Build
-      run: go build
-
     - name: Install Fyne tool
       run: go install fyne.io/fyne/v2/cmd/fyne@latest