Update multiOSReleases.yml

2025-11-30 16:51:05 +01:00
parent 4634ccb25d
commit 2f33d0318e
1 changed files with 57 additions and 45 deletions
@@ -175,7 +175,7 @@ jobs:
          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf linuxdeploy libjavascriptcoregtk-4.0-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev libsoup-3.0-dev \
            #  build-essential \
            #  libssl-dev \
-            #  libayatana-appindicator3-dev \
+             libayatana-appindicator3-dev \
             libfuse2

      - name: Setup Node.js
@@ -197,58 +197,70 @@ jobs:
          java-version: "21"
          distribution: "temurin"

+      - name: Cache custom JRE
+        id: cache-jre
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: frontend/src-tauri/runtime/jre
+          key: jre-${{ runner.os }}-${{ hashFiles('build.gradle*', 'app/core/build.gradle*', 'app/common/build.gradle*', 'app/proprietary/build.gradle*', 'gradle/libs.versions.toml', 'app/core/src/main/**') }}
+
      - name: Build Java backend with JLink
        working-directory: ./
        shell: bash
        run: |
-          chmod +x ./gradlew
-          echo "🔧 Building Stirling-PDF JAR..."
-          ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+          if [ -d "./frontend/src-tauri/runtime/jre/bin" ] && [ "${{ steps.cache-jre.outputs.cache-hit }}" = "true" ]; then
+            echo "✅ Using cached custom JRE"
+          else
+            echo "🔧 (Re)creating custom JRE with jlink..."
+            chmod +x ./gradlew
+            echo "🔧 Building Stirling-PDF JAR..."
+            ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube

-          # Find the built JAR
-          STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
-          echo "✅ Built JAR: $STIRLING_JAR"
+            # Find the built JAR
+            STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
+            echo "✅ Built JAR: $STIRLING_JAR"

-          # Create Tauri directories
-          mkdir -p ./frontend/src-tauri/libs
-          mkdir -p ./frontend/src-tauri/runtime
+            # Create Tauri directories
+            mkdir -p ./frontend/src-tauri/libs
+            mkdir -p ./frontend/src-tauri/runtime

-          # Copy JAR to Tauri libs
-          cp "$STIRLING_JAR" ./frontend/src-tauri/libs/
-          echo "✅ JAR copied to Tauri libs"
+            # Copy JAR to Tauri libs
+            cp "$STIRLING_JAR" ./frontend/src-tauri/libs/
+            echo "✅ JAR copied to Tauri libs"

-          # Analyze JAR dependencies for jlink modules
-          echo "🔍 Analyzing JAR dependencies..."
-          if command -v jdeps &> /dev/null; then
-            DETECTED_MODULES=$(jdeps --print-module-deps --ignore-missing-deps "$STIRLING_JAR" 2>/dev/null || echo "")
-            if [ -n "$DETECTED_MODULES" ]; then
-              echo "📋 jdeps detected modules: $DETECTED_MODULES"
-              MODULES="$DETECTED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+            # Analyze JAR dependencies for jlink modules
+            echo "🔍 Analyzing JAR dependencies..."
+            if command -v jdeps &> /dev/null; then
+              DETECTED_MODULES=$(jdeps --print-module-deps --ignore-missing-deps "$STIRLING_JAR" 2>/dev/null || echo "")
+              if [ -n "$DETECTED_MODULES" ]; then
+                echo "📋 jdeps detected modules: $DETECTED_MODULES"
+                MODULES="$DETECTED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+              else
+                echo "⚠️ jdeps analysis failed, using predefined modules"
+                MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+              fi
            else
-              echo "⚠️ jdeps analysis failed, using predefined modules"
+              echo "⚠️ jdeps not available, using predefined modules"
              MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
            fi
-          else
-            echo "⚠️ jdeps not available, using predefined modules"
-            MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+
+            # Create custom JRE with jlink
+            echo "🔧 Creating custom JRE with jlink..."
+            echo "📋 Using modules: $MODULES"
+
+            # Remove any existing JRE
+            rm -rf ./frontend/src-tauri/runtime/jre
+
+            # Create the custom JRE
+            jlink \
+              --add-modules "$MODULES" \
+              --strip-debug \
+              --compress=2 \
+              --no-header-files \
+              --no-man-pages \
+              --output ./frontend/src-tauri/runtime/jre
          fi

-          # Create custom JRE with jlink
-          echo "🔧 Creating custom JRE with jlink..."
-          echo "📋 Using modules: $MODULES"
-
-          # Remove any existing JRE
-          rm -rf ./frontend/src-tauri/runtime/jre
-
-          # Create the custom JRE
-          jlink \
-            --add-modules "$MODULES" \
-            --strip-debug \
-            --compress=2 \
-            --no-header-files \
-            --no-man-pages \
-            --output ./frontend/src-tauri/runtime/jre
-
          if [ ! -d "./frontend/src-tauri/runtime/jre" ]; then
            echo "❌ Failed to create JLink runtime"
            exit 1
@@ -570,10 +582,10 @@ jobs:
          tag_name: v${{ needs.determine-matrix.outputs.version }}
          generate_release_notes: true
          files: |
-            ./artifacts/**/*.jar
-            ./artifacts/**/*.msi
-            ./artifacts/**/*.dmg
-            ./artifacts/**/*.deb
-            ./artifacts/**/*.AppImage
+            ./artifacts/**/Stirling-PDF-*.jar
+            ./artifacts/**/Stirling-PDF-*.msi
+            ./artifacts/**/Stirling-PDF-*.dmg
+            ./artifacts/**/Stirling-PDF-*.deb
+            ./artifacts/**/Stirling-PDF-*.AppImage
          draft: false
          prerelease: false