From 6cfd2dea9685272aaf1a9c9be08b972a7acee323 Mon Sep 17 00:00:00 2001
From: Aaron Reisman <aaron@reisman.org>
Date: Sun, 22 Jan 2023 13:01:12 -0600
Subject: [PATCH] Move deb building out of the build pipeline

---
 .github/workflows/build-linux.yml                 |  4 ----
 .github/workflows/build-windows.yml               |  8 +-------
 .github/workflows/build.yml                       | 15 +--------------
 .github/workflows/{build-deb.yml => deb.yml}      |  9 ++++-----
 .github/workflows/release.yml                     |  7 ++++++-
 .../workflows/scripts => Scripts}/targz2deb.sh    |  0
 6 files changed, 12 insertions(+), 31 deletions(-)
 rename .github/workflows/{build-deb.yml => deb.yml} (74%)
 rename {.github/workflows/scripts => Scripts}/targz2deb.sh (100%)
 mode change 100644 => 100755

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index b9b7cf37..2c9ffa2d 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -15,10 +15,6 @@ on:
         description: 'Skip running unit tests'
         required: false
         default: true
-    outputs:
-      version:
-        description: "The Libation version number"
-        value: ${{ jobs.build.outputs.version }}
 
 env:
   DOTNET_CONFIGURATION: 'Release'
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index cfac74ec..f82aa21e 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -15,10 +15,6 @@ on:
         description: 'Skip running unit tests'
         required: false
         default: true
-    outputs:
-      version:
-        description: "The Libation version number"
-        value: ${{ jobs.build.outputs.version }}
 
 env:
   DOTNET_CONFIGURATION: 'Release'
@@ -27,8 +23,6 @@ env:
 jobs:
   build:
     runs-on: windows-latest
-    outputs:
-      version: ${{ steps.get_version.outputs.version }}
     strategy:
       matrix:
         os: [Windows]
@@ -74,7 +68,7 @@ jobs:
       - name: Zip artifact
         id: zip
         working-directory: ./Source/bin/Publish
-        run: |        
+        run: |
           $dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
           $delfiles = @("libmp3lame.so", "ffmpegaac.so", "glass-with-glow_256.svg", "Libation.desktop")
           foreach ($file in $delfiles){ if (test-path $dir$file){ Remove-Item $dir$file } }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37707947..b6cf9787 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,11 +15,6 @@ on:
         description: 'Skip running unit tests'
         required: false
         default: true        
-      build_deb:
-        type: boolean
-        description: 'Build Debian package'
-        required: false
-        default: false
 
 jobs:
   windows:
@@ -32,12 +27,4 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       version_override: ${{ inputs.version_override }}
-      run_unit_tests: ${{ inputs.run_unit_tests }}
-
-  linux_deb:
-    needs: [linux]
-    if: inputs.build_deb
-    uses: ./.github/workflows/build-deb.yml
-    with:
-      version: ${{ needs.linux.outputs.version }}
-      
+      run_unit_tests: ${{ inputs.run_unit_tests }}     
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/deb.yml
similarity index 74%
rename from .github/workflows/build-deb.yml
rename to .github/workflows/deb.yml
index e1e3db3d..3557b629 100644
--- a/.github/workflows/build-deb.yml
+++ b/.github/workflows/deb.yml
@@ -1,7 +1,7 @@
-# build-deb.yml
+# deb.yml
 # Reusable workflow that builds the Linux Debian package.
 ---
-name: build_deb
+name: deb
 
 on:
   workflow_call:
@@ -21,15 +21,14 @@ jobs:
       - uses: actions/checkout@v3
       
       - name: Download Artifact
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v3
         with:
           name: "${{ env.FILE_NAME }}.tar.gz"
 
       - name: Build .deb
         id: deb
         run: |
-          chmod +x ./.github/workflows/scripts/targz2deb.sh
-          ./.github/workflows/scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
+          ./Scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
       
       - name: Publish .deb
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 564c8b03..ba061933 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,12 @@ jobs:
     with:
       version_override: ${{ needs.prerelease.outputs.version }}
       run_unit_tests: false
-      build_deb: true
+
+  deb:
+    needs: [prerelease,build]
+    uses: ./.github/workflows/build-deb.yml
+    with:
+      version: ${{ needs.prerelease.outputs.version }}
       
   release:
     needs: [prerelease,build]
diff --git a/.github/workflows/scripts/targz2deb.sh b/Scripts/targz2deb.sh
old mode 100644
new mode 100755
similarity index 100%
rename from .github/workflows/scripts/targz2deb.sh
rename to Scripts/targz2deb.sh