mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-08-02 13:48:15 +02:00
Fix paths from merges
This commit is contained in:
parent
77c9e4bf46
commit
a4e9b3ba38
4
.github/workflows/tauri-build.yml
vendored
4
.github/workflows/tauri-build.yml
vendored
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user