From bf1e65980eca4e749a127888ec6a406dcecd2a77 Mon Sep 17 00:00:00 2001
From: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:34:09 -0500
Subject: [PATCH] Add Ubuntu 22.04 build and fix release artifact paths

---
 .github/workflows/build.yml | 39 ++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c312b7..c28bceb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [macos-arm64, windows-x64, linux-x64]
+        target: [macos-arm64, windows-x64, linux-24.04-x64, linux-22.04-x64]
         include:
         # - target: macos-arm64
         #   os: macos
@@ -29,7 +29,12 @@ jobs:
           arch: x64
           runner: windows-latest
 
-        - target: linux-x64
+        - target: linux-22.04-x64
+          os: linux
+          arch: x64
+          runner: ubuntu-latest
+
+        - target: linux-24.04-x64
           os: linux
           arch: x64
           runner: ubuntu-latest
@@ -173,35 +178,25 @@ jobs:
         with:
           path: artifacts
 
-      - name: List downloaded artifacts
-        run: |
-          ls artifacts 
-          ls -R artifacts
-
-      - name: Windows artifacts
-        run: ls artifacts/windows-x64
-
-      - name: Linux artifacts
-        run: ls artifacts/linux-x64
-
-      - name: MacOS artifacts
-        run: ls artifacts/macos-arm64
+      - name: Display structure of downloaded files
+        run: ls -R artifacts
 
-      - name: Zip and rename artifacts
+      - name: Zip platform-specific bundles
         run: |
           cd artifacts/
-          zip -r ./linux-x64.zip ./linux-x64
+          zip -r ./linux-22.04-x64.zip ./linux-22.04-x64
+          zip -r ./linux-24.04-x64.zip ./linux-24.04-x64
           zip -r ./windows-x64.zip ./windows-x64
-          zip -r ./macos-arm64.zip ./macos-arm64
-          mv "windows-x64 Inno installer/windows_installer.exe" ./windows-x64/windows-x64\ Inno\ installer.exe
+          mv macos-arm64/result.zip ./macos-arm64.zip
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            artifacts/windows-x64/desktop_adb_file_browser.msix
-            artifacts/windows-x64/windows-x64 Inno installer.exe
+            artifacts/windows-x64-msix/desktop_adb_file_browser.msix
+            artifacts/windows-x64 Inno installer/windows_installer.exe
             artifacts/windows-x64.zip
-            artifacts/linux-x64.zip
+            artifacts/linux-22.04-x64.zip
+            artifacts/linux-24.04-x64.zip
             artifacts/macos-arm64.zip
           fail_on_unmatched_files: true