build overlay server seperately

bpwhelan · bpwhelan · commit ff494265b00f · 2026-06-13T13:35:57.000-04:00
diff --git a/.github/workflows/build_overlay_server.yml b/.github/workflows/build_overlay_server.yml
@@ -1,8 +1,20 @@
 name: Build Overlay Server
 
+# Builds the Rust gsm_overlay_server binaries and publishes them to a single
+# rolling "overlay-server" release that the app release workflows pull from,
+# so they don't have to set up Rust and rebuild it every run.
 on:
+  push:
+    branches:
+      - main
+    paths:
+      - GSM_Overlay/input_server/**
   workflow_dispatch:
 
+concurrency:
+  group: build-overlay-server-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-windows:
     runs-on: windows-latest
@@ -51,13 +63,25 @@ jobs:
           wait-for-completion: true
           output-artifact-directory: signed_output
 
-      - name: Upload signed binary
-        if: steps.sign.outcome == 'success'
+      - name: Stage binary for release (prefer signed)
+        shell: pwsh
+        run: |
+          New-Item -ItemType Directory -Force -Path staging | Out-Null
+          $signed = Get-ChildItem -Path signed_output -Recurse -File -Filter gsm_overlay_server.exe -ErrorAction SilentlyContinue | Select-Object -First 1
+          if ($signed) {
+            Write-Host "Using signed binary: $($signed.FullName)"
+            Copy-Item $signed.FullName staging/gsm_overlay_server-win32.exe -Force
+          } else {
+            Write-Warning "Signed binary not available; falling back to unsigned."
+            Copy-Item GSM_Overlay/input_server/target/release/gsm_overlay_server.exe staging/gsm_overlay_server-win32.exe -Force
+          }
+
+      - name: Upload windows artifact
         uses: actions/upload-artifact@v4
         with:
-          name: gsm-overlay-server-signed-windows
-          path: signed_output
-          if-no-files-found: warn
+          name: overlay-server-win32
+          path: staging/gsm_overlay_server-win32.exe
+          if-no-files-found: error
 
   build-linux:
     runs-on: ubuntu-latest
@@ -91,11 +115,16 @@ jobs:
       - name: Build gamepad server (Linux)
         run: cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
 
-      - name: Upload binary
+      - name: Stage binary for release
+        run: |
+          mkdir -p staging
+          cp GSM_Overlay/input_server/target/release/gsm_overlay_server staging/gsm_overlay_server-linux
+
+      - name: Upload linux artifact
         uses: actions/upload-artifact@v4
         with:
-          name: gsm-overlay-server-linux
-          path: GSM_Overlay/input_server/target/release/gsm_overlay_server
+          name: overlay-server-linux
+          path: staging/gsm_overlay_server-linux
           if-no-files-found: error
 
   build-mac-arm64:
@@ -121,9 +150,50 @@ jobs:
       - name: Build gamepad server (macOS)
         run: cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
 
-      - name: Upload binary
+      - name: Stage binary for release
+        run: |
+          mkdir -p staging
+          cp GSM_Overlay/input_server/target/release/gsm_overlay_server staging/gsm_overlay_server-darwin
+
+      - name: Upload mac artifact
         uses: actions/upload-artifact@v4
         with:
-          name: gsm-overlay-server-mac-arm64
-          path: GSM_Overlay/input_server/target/release/gsm_overlay_server
+          name: overlay-server-darwin
+          path: staging/gsm_overlay_server-darwin
           if-no-files-found: error
+
+  publish:
+    runs-on: ubuntu-latest
+    needs:
+      - build-windows
+      - build-linux
+      - build-mac-arm64
+    permissions:
+      contents: write
+    steps:
+      - name: Download platform binaries
+        uses: actions/download-artifact@v4
+        with:
+          pattern: overlay-server-*
+          path: staging
+          merge-multiple: true
+
+      - name: Publish to rolling overlay-server release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: overlay-server
+          name: Overlay Server Binaries
+          body: |
+            Prebuilt `gsm_overlay_server` binaries consumed by the app release
+            workflows. Auto-updated whenever `GSM_Overlay/input_server` changes.
+            Not a user-facing release.
+          prerelease: true
+          make_latest: false
+          overwrite_files: true
+          fail_on_unmatched_files: true
+          files: |
+            staging/gsm_overlay_server-win32.exe
+            staging/gsm_overlay_server-linux
+            staging/gsm_overlay_server-darwin
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/dev_release_exe.yml b/.github/workflows/dev_release_exe.yml
@@ -71,15 +71,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -93,11 +84,13 @@ jobs:
       - name: Stamp version into package.json
         run: npm version ${{ needs.compute-version.outputs.PACKAGE_VERSION }} --no-git-tag-version --allow-same-version
 
-      - name: Build gamepad server (Windows)
+      - name: Fetch prebuilt overlay server (Windows)
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           New-Item -ItemType Directory -Force -Path GSM_Overlay/input_server/bin/win32 | Out-Null
-          Copy-Item GSM_Overlay/input_server/target/release/gsm_overlay_server.exe GSM_Overlay/input_server/bin/win32/gsm_overlay_server.exe -Force
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-win32.exe --output GSM_Overlay/input_server/bin/win32/gsm_overlay_server.exe --clobber
 
       - name: Write prerelease metadata
         run: |
@@ -306,15 +299,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -328,20 +312,12 @@ jobs:
       - name: Stamp version into package.json
         run: npm version ${{ needs.compute-version.outputs.PACKAGE_VERSION }} --no-git-tag-version --allow-same-version
 
-      - name: Install Linux native build deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            pkg-config \
-            libudev-dev \
-            libx11-dev \
-            libxtst-dev
-
-      - name: Build gamepad server (Linux)
+      - name: Fetch prebuilt overlay server (Linux)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           mkdir -p GSM_Overlay/input_server/bin/linux
-          cp GSM_Overlay/input_server/target/release/gsm_overlay_server GSM_Overlay/input_server/bin/linux/gsm_overlay_server
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-linux --output GSM_Overlay/input_server/bin/linux/gsm_overlay_server --clobber
           chmod +x GSM_Overlay/input_server/bin/linux/gsm_overlay_server
 
       - name: Write prerelease metadata
@@ -400,15 +376,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -422,11 +389,12 @@ jobs:
       - name: Stamp version into package.json
         run: npm version ${{ needs.compute-version.outputs.PACKAGE_VERSION }} --no-git-tag-version --allow-same-version
 
-      - name: Build gamepad server (macOS)
+      - name: Fetch prebuilt overlay server (macOS)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           mkdir -p GSM_Overlay/input_server/bin/darwin
-          cp GSM_Overlay/input_server/target/release/gsm_overlay_server GSM_Overlay/input_server/bin/darwin/gsm_overlay_server
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-darwin --output GSM_Overlay/input_server/bin/darwin/gsm_overlay_server --clobber
           chmod +x GSM_Overlay/input_server/bin/darwin/gsm_overlay_server
 
       - name: Write prerelease metadata
diff --git a/.github/workflows/release_exe.yml b/.github/workflows/release_exe.yml
@@ -176,15 +176,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -195,11 +186,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-electron-cache-
 
-      - name: Build gamepad server (Windows)
+      - name: Fetch prebuilt overlay server (Windows)
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           New-Item -ItemType Directory -Force -Path GSM_Overlay/input_server/bin/win32 | Out-Null
-          Copy-Item GSM_Overlay/input_server/target/release/gsm_overlay_server.exe GSM_Overlay/input_server/bin/win32/gsm_overlay_server.exe -Force
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-win32.exe --output GSM_Overlay/input_server/bin/win32/gsm_overlay_server.exe --clobber
 
       - name: Convert Handlebar files to LF line endings
         run: |
@@ -466,15 +459,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -485,20 +469,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-electron-cache-
 
-      - name: Install Linux native build deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            pkg-config \
-            libudev-dev \
-            libx11-dev \
-            libxtst-dev
-
-      - name: Build gamepad server (Linux)
+      - name: Fetch prebuilt overlay server (Linux)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           mkdir -p GSM_Overlay/input_server/bin/linux
-          cp GSM_Overlay/input_server/target/release/gsm_overlay_server GSM_Overlay/input_server/bin/linux/gsm_overlay_server
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-linux --output GSM_Overlay/input_server/bin/linux/gsm_overlay_server --clobber
           chmod +x GSM_Overlay/input_server/bin/linux/gsm_overlay_server
 
       - name: Build Overlay
@@ -561,15 +537,6 @@ jobs:
             package-lock.json
             GSM_Overlay/package-lock.json
 
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Cache Rust build
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            GSM_Overlay/input_server -> GSM_Overlay/input_server/target
-
       - name: Cache Electron binaries
         uses: actions/cache@v4
         with:
@@ -580,11 +547,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-electron-cache-
 
-      - name: Build gamepad server (macOS)
+      - name: Fetch prebuilt overlay server (macOS)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cargo build --release --manifest-path GSM_Overlay/input_server/Cargo.toml
           mkdir -p GSM_Overlay/input_server/bin/darwin
-          cp GSM_Overlay/input_server/target/release/gsm_overlay_server GSM_Overlay/input_server/bin/darwin/gsm_overlay_server
+          gh release download overlay-server --repo ${{ github.repository }} --pattern gsm_overlay_server-darwin --output GSM_Overlay/input_server/bin/darwin/gsm_overlay_server --clobber
           chmod +x GSM_Overlay/input_server/bin/darwin/gsm_overlay_server
 
       - name: Build Overlay
