From 493d0b2e8ce6682d748699937d3b17bbf1a4e275 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Mon, 9 Dec 2024 12:05:31 -0600
Subject: [PATCH] Reworked action and bump lus

---
 .github/workflows/main.yml | 48 ++++++++++++++++++++++++++------------
 libultraship               |  2 +-
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 138ed02c..9c2cd185 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Generate starship.otr
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        make -C tools/Torch type=release -j12
+        make -C tools/Torch type=release -j3
         tools/Torch/cmake-build-release/torch pack port starship.otr
     - uses: actions/upload-artifact@v4
       with:
@@ -45,6 +45,7 @@ jobs:
         retention-days: 1
 
   build-windows:
+    needs: generate-port-otr
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
@@ -53,15 +54,20 @@ jobs:
       - name: Build
         run: |
           cmake -S . -B "build/x64" -G "Visual Studio 17 2022" -T v143 -A x64 -DCMAKE_BUILD_TYPE=Release
-          cmake --build ./build/x64
+          cmake --build ./build/x64 --config Release --parallel 10
+      - name: Download starship.otr
+        uses: actions/download-artifact@v4
+        with:
+          name: starship.otr
+          path: ./build/x64/Release/starship.otr
       - name: Upload build
         uses: actions/upload-artifact@v4
         with:
           name: starship-windows
-          path: ./build/x64/Debug
-          retention-days: 1
+          path: ./build/x64/Release
 
   build-macos:
+    needs: generate-port-otr
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v4
@@ -72,19 +78,25 @@ jobs:
       - name: Build
         run: |
           cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake -j
+          cmake --build build-cmake --config Release -j3
+      - name: Download starship.otr
+        uses: actions/download-artifact@v4
+        with:
+          name: starship.otr
+          path: build-cmake/starship.otr
       - name: Create Package
         run: |
           mkdir starship-release
           mv build-cmake/Starship starship-release/
+          mv build-cmake/starship.otr starship-release/
       - name: Publish packaged artifacts
         uses: actions/upload-artifact@v4
         with:
             name: starship-mac-x64
             path: starship-release
-            retention-days: 1
 
   build-linux:
+    needs: generate-port-otr
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -98,7 +110,7 @@ jobs:
           wget https://www.libsdl.org/release/SDL2-2.24.1.tar.gz
           tar -xzf SDL2-2.24.1.tar.gz
           cd SDL2-2.24.1
-          ./configure
+          ./configure --enable-hidapi-libusb
           make -j 10
           sudo make install
       - name: Install latest tinyxml2
@@ -112,16 +124,22 @@ jobs:
           cmake ..
           make
           sudo make install
+      - name: Download starship.otr
+        uses: actions/download-artifact@v4
+        with:
+          name: starship.otr
+          path: build-cmake/starship.otr
       - name: Build
         run: |
           cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake -j
-      - name: Create Package
-        run: |
-          mkdir starship-release
-          mv build-cmake/Starship starship-release/
-      - name: Publish packaged artifacts
+          cmake --build build-cmake --config Release -j3
+          (cd build-cmake && cpack -G External)
+
+          mv README.md readme.txt
+          mv build-cmake/*.appimage starship.appimage
+      - name: Upload build
         uses: actions/upload-artifact@v4
         with:
-          name: starship-linux-x64
-          path: starship-release
\ No newline at end of file
+          name: Starship-linux
+          path: |
+            starship.appimage
\ No newline at end of file
diff --git a/libultraship b/libultraship
index 99d78d61..1a8f6c0d 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 99d78d61380048bbcec2f8364f5d876681fd982e
+Subproject commit 1a8f6c0db9a56017611eba57298d9c2eddc18f88