From a4e9b3ba38ec58e5484a00e6992eb2963f1f2a3a Mon Sep 17 00:00:00 2001 From: Connor Yoh Date: Tue, 22 Jul 2025 17:05:50 +0100 Subject: [PATCH] Fix paths from merges --- .github/workflows/tauri-build.yml | 4 ++-- scripts/build-tauri-jlink.bat | 6 +++--- scripts/build-tauri-jlink.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 5e85cf63d..b6c499f86 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -22,7 +22,7 @@ on: - 'frontend/package-lock.json' - '.github/workflows/tauri-build.yml' push: - branches: [main, "infra/tauri-actions"] + branches: [main, V2, infra/tauri-actions"] paths: - 'frontend/src-tauri/**' - 'frontend/src/**' @@ -114,7 +114,7 @@ jobs: ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube # Find the built JAR - STIRLING_JAR=$(ls stirling-pdf/build/libs/stirling-pdf-*.jar | head -n 1) + STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1) echo "✅ Built JAR: $STIRLING_JAR" # Create Tauri directories diff --git a/scripts/build-tauri-jlink.bat b/scripts/build-tauri-jlink.bat index fb81b8438..d3a73f058 100644 --- a/scripts/build-tauri-jlink.bat +++ b/scripts/build-tauri-jlink.bat @@ -28,8 +28,8 @@ if errorlevel 1 ( REM Find the built JAR(s) echo ▶ Listing all built JAR files in app\core\build\libs: -dir /b app\core\build\libs\Stirling-PDF-*.jar -for %%f in (app\core\build\libs\Stirling-PDF-*.jar) do set STIRLING_JAR=%%f +dir /b app\core\build\libs\stirling-pdf-*.jar +for %%f in (app\core\build\libs\stirling-pdf-*.jar) do set STIRLING_JAR=%%f if not exist "%STIRLING_JAR%" ( echo ❌ No Stirling-PDF JAR found in build/libs/ exit /b 1 @@ -47,7 +47,7 @@ echo ✅ JAR copied to frontend\src-tauri\libs\ REM Log out all JAR files now in the Tauri libs directory echo ▶ Listing all JAR files in frontend\src-tauri\libs after copy: -dir /b frontend\src-tauri\libs\Stirling-PDF-*.jar +dir /b frontend\src-tauri\libs\stirling-pdf-*.jar echo ▶ Creating custom JRE with jlink... if exist "frontend\src-tauri\runtime\jre" rmdir /s /q "frontend\src-tauri\runtime\jre" diff --git a/scripts/build-tauri-jlink.sh b/scripts/build-tauri-jlink.sh index 10448173c..5b576d091 100644 --- a/scripts/build-tauri-jlink.sh +++ b/scripts/build-tauri-jlink.sh @@ -62,13 +62,13 @@ fi print_step "Building Stirling-PDF JAR..." ./gradlew clean bootJar --no-daemon -if [ ! -f "stirling-pdf/build/libs/Stirling-PDF-"*.jar ]; then - print_error "Failed to build Stirling-PDF JAR" +if [ ! -f "app\core\build\libs\stirling-pdf-*.jar"*.jar ]; then + print_error "Failed to build stirling-pdf JAR" exit 1 fi # Find the built JAR -STIRLING_JAR=$(ls stirling-pdf/build/libs/Stirling-PDF-*.jar | head -n 1) +STIRLING_JAR=$(ls app\core\build\libs\stirling-pdf-*.jar | head -n 1) print_success "Built JAR: $STIRLING_JAR" # Create directories for Tauri