updated build pipeline

Author: RadicalMuffinMan

.github/workflows/build.yml

@@ -167,10 +167,21 @@ jobs:
         shell: pwsh
         run: .\build-windows.ps1
 
+      - name: Verify Windows artifact
+        shell: pwsh
+        run: |
+          $artifacts = Get-ChildItem -Path . -Filter "Moonfin_Windows_v*.exe" -File -ErrorAction SilentlyContinue
+          if (-not $artifacts -or $artifacts.Count -eq 0) {
+            throw "Windows build did not produce Moonfin_Windows_v*.exe"
+          }
+          Write-Host "Found Windows artifact(s):"
+          $artifacts | ForEach-Object { Write-Host "  - $($_.Name)" }
+
       - uses: actions/upload-artifact@v4
         with:
           name: windows-exe
           path: Moonfin_Windows_v*.exe
+          if-no-files-found: error
 
   # ─────────────────────────────────────────────
   # Linux (6 formats weeeeee)
@@ -204,11 +215,47 @@ jobs:
       - name: Install snapcraft
         run: sudo snap install snapcraft --classic
 
+      - name: Prepare snapd and core22
+        run: |
+          sudo snap wait system seed.loaded
+          sudo snap list core22 >/dev/null 2>&1 || sudo snap install core22 --channel=latest/stable
+
       - name: Build all Linux packages
         run: |
           chmod +x build-linux.sh
           ./build-linux.sh all
 
+      - name: Verify Linux artifacts
+        run: |
+          set -euo pipefail
+          shopt -s nullglob
+          patterns=(
+            "Moonfin_Linux_v*.tar.gz"
+            "Moonfin_Linux_v*.AppImage"
+            "Moonfin_Linux_v*.deb"
+            "Moonfin_Linux_v*.rpm"
+            "Moonfin_Linux_v*.snap"
+            "Moonfin_Linux_v*.flatpak"
+          )
+
+          missing=0
+          for pattern in "${patterns[@]}"; do
+            matches=( $pattern )
+            if [ ${#matches[@]} -eq 0 ]; then
+              echo "Missing artifact for pattern: $pattern"
+              missing=1
+            else
+              for m in "${matches[@]}"; do
+                echo "Found artifact: $m"
+              done
+            fi
+          done
+
+          if [ $missing -ne 0 ]; then
+            echo "One or more Linux package artifacts are missing."
+            exit 1
+          fi
+
       - uses: actions/upload-artifact@v4
         with:
           name: linux-packages
@@ -219,6 +266,7 @@ jobs:
             Moonfin_Linux_v*.rpm
             Moonfin_Linux_v*.snap
             Moonfin_Linux_v*.flatpak
+          if-no-files-found: error
 
   # ─────────────────────────────────────────────
   # GitHub Release

build-linux.sh

@@ -544,6 +544,27 @@ EOF
   fi
 }
 
+retry_with_backoff() {
+  local max_attempts="$1"
+  shift
+
+  local attempt=1
+  while true; do
+    if "$@"; then
+      return 0
+    fi
+
+    if [ "$attempt" -ge "$max_attempts" ]; then
+      return 1
+    fi
+
+    local delay=$((attempt * 10))
+    echo "Command failed (attempt $attempt/$max_attempts). Retrying in ${delay}s..."
+    sleep "$delay"
+    attempt=$((attempt + 1))
+  done
+}
+
 build_snap() {
   echo "=== Building Snap Package ==="
   if ! command -v snapcraft >/dev/null 2>&1; then
@@ -552,6 +573,21 @@ build_snap() {
     return 1
   fi
 
+  if command -v snap >/dev/null 2>&1; then
+    echo "Waiting for snapd seed to complete..."
+    if ! snap wait system seed.loaded >/dev/null 2>&1; then
+      echo "Warning: snapd seed wait failed; continuing and letting snapcraft attempt build."
+    fi
+
+    if ! snap list core22 >/dev/null 2>&1; then
+      echo "core22 not found. Installing core22 base snap..."
+      if ! retry_with_backoff 3 sudo snap install core22 --channel=latest/stable; then
+        echo "Failed to install core22 after retries."
+        return 1
+      fi
+    fi
+  fi
+
   local snap_dir="$TEMP_DIR/snap"
   local version="$(get_app_version)"
 
@@ -603,7 +639,10 @@ EOF
   [ -f "$APP_ICON" ] && cp "$APP_ICON" "$snap_dir/${APP_ID}.png"
 
   cd "$snap_dir"
-  snapcraft --destructive-mode || true
+  if ! retry_with_backoff 3 snapcraft pack --destructive-mode; then
+    echo "Snap build failed after retries"
+    return 1
+  fi
 
   local snap_file
   snap_file=$(find "$snap_dir" -maxdepth 1 -name "*.snap" 2>/dev/null | head -1)
@@ -612,6 +651,7 @@ EOF
     echo "✓ Created: $REPO_ROOT/${APP_NAME}_Linux_v${version}.snap"
   else
     echo "Snap build did not produce a .snap file"
+    return 1
   fi
 }
 

build-windows.ps1

@@ -1,4 +1,4 @@
-$ErrorActionPreference = 'Continue'
+$ErrorActionPreference = 'Stop'
 
 $repoRoot = Split-Path -Parent $MyInvocation.MyCommand.Path
 
@@ -64,12 +64,19 @@ function Assert-ToolchainVersions {
   $minFlutter = [Version]::Parse('3.41.0')
   $minDart = [Version]::Parse('3.11.0')
 
-  $versionJson = & $FlutterExe --version --machine
-  if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($versionJson)) {
+  $rawOutput = (& $FlutterExe --version --machine | Out-String)
+  if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($rawOutput)) {
     throw "Failed to query Flutter version. Run 'flutter --version' manually and verify your SDK installation."
   }
 
-  $versionInfo = $versionJson | ConvertFrom-Json
+  # Flutter can emit setup chatter (e.g. "Running pub upgrade...") before JSON.
+  # Extract the JSON object from mixed output to avoid ConvertFrom-Json failures.
+  $jsonMatch = [regex]::Match($rawOutput, '\{[\s\S]*\}')
+  if (-not $jsonMatch.Success) {
+    throw "Failed to parse Flutter --version --machine output as JSON. Raw output: $rawOutput"
+  }
+
+  $versionInfo = $jsonMatch.Value | ConvertFrom-Json
   $flutterVersion = Get-NormalizedVersion $versionInfo.frameworkVersion
   $dartVersion = Get-NormalizedVersion $versionInfo.dartSdkVersion