Skip to content

Commit 5ac2260

Browse files
FrooodleFrooodle
authored
Merge pull request #2451 from Stirling-Tools/testStuff Full local webUI client
Full local webUI client
2 parents 2297c5d + bae83a2 commit 5ac2260

File tree

13 files changed

+853
-46
lines changed

13 files changed

+853
-46
lines changed

‎.github/workflows/multiOSReleases.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: Test Installers Build
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
types: [created]
7+
permissions:
8+
contents: write
9+
packages: write
10+
jobs:
11+
build-installers:
12+
strategy:
13+
matrix:
14+
include:
15+
- os: windows-latest
16+
platform: win
17+
ext: exe
18+
#- os: macos-latest
19+
# platform: mac
20+
# ext: dmg
21+
#- os: ubuntu-latest
22+
# platform: linux
23+
# ext: deb
24+
runs-on: ${{ matrix.os }}
25+
26+
steps:
27+
- uses: actions/checkout@v4
28+
29+
- name: Set up JDK 21
30+
uses: actions/setup-java@v4
31+
with:
32+
java-version: "21"
33+
distribution: "temurin"
34+
35+
- uses: gradle/actions/setup-gradle@v4
36+
with:
37+
gradle-version: 8.7
38+
39+
# Install Windows dependencies
40+
- name: Install WiX Toolset
41+
if: matrix.os == 'windows-latest'
42+
run: |
43+
curl -L -o wix.exe https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
44+
.\wix.exe /install /quiet
45+
46+
# Install Linux dependencies
47+
- name: Install Linux Dependencies
48+
if: matrix.os == 'ubuntu-latest'
49+
run: |
50+
sudo apt-get update
51+
sudo apt-get install -y fakeroot rpm
52+
53+
# Get version number
54+
- name: Get version number
55+
id: versionNumber
56+
run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
57+
shell: bash
58+
59+
- name: Get version number mac
60+
id: versionNumberMac
61+
run: echo "versionNumberMac=$(./gradlew printMacVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
62+
shell: bash
63+
64+
# Build installer
65+
- name: Build Installer
66+
run: ./gradlew build jpackage -x test --info
67+
env:
68+
DOCKER_ENABLE_SECURITY: false
69+
STIRLING_PDF_DESKTOP_UI: true
70+
71+
# Rename and collect artifacts based on OS
72+
- name: Prepare artifacts
73+
id: prepare
74+
shell: bash
75+
run: |
76+
if [ "${{ matrix.os }}" = "windows-latest" ]; then
77+
mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
78+
elif [ "${{ matrix.os }}" = "macos-latest" ]; then
79+
mv "build/jpackage/Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
80+
else
81+
mv "build/jpackage/stirling-pdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
82+
fi
83+
84+
# Upload installer as artifact for testing
85+
- name: Upload Installer Artifact
86+
uses: actions/upload-artifact@v4
87+
with:
88+
name: Stirling-PDF-${{ matrix.platform }}-installer.{{ matrix.ext }}
89+
path: Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}
90+
retention-days: 1
91+
if-no-files-found: error

‎.github/workflows/releaseArtifacts.yml

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,82 @@ jobs:
3535
run: ./gradlew clean createExe
3636
env:
3737
DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
38+
STIRLING_PDF_DESKTOP_UI: false
3839

3940
- name: Get version number
4041
id: versionNumber
4142
run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
4243

4344
- name: Rename binarie
44-
if: matrix.file_suffix != ''
45-
run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
45+
run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
4646

4747
- name: Upload Assets binarie
4848
uses: actions/upload-artifact@v4
4949
with:
50-
path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
51-
name: Stirling-PDF${{ matrix.file_suffix }}.exe
50+
path: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
51+
name: Stirling-PDF-Server${{ matrix.file_suffix }}.exe
5252
overwrite: true
5353
retention-days: 1
5454
if-no-files-found: error
55+
5556
- name: Upload binaries to release
5657
uses: softprops/action-gh-release@v2
5758
with:
58-
files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
59+
files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
5960

6061
- name: Rename jar binaries
61-
run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
62+
run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
6263

6364
- name: Upload Assets jar binaries
6465
uses: actions/upload-artifact@v4
6566
with:
66-
path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
67-
name: Stirling-PDF${{ matrix.file_suffix }}.jar
67+
path: ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
68+
name: Stirling-PDF-Server${{ matrix.file_suffix }}.jar
6869
overwrite: true
6970
retention-days: 1
7071
if-no-files-found: error
7172

7273
- name: Upload jar binaries to release
7374
uses: softprops/action-gh-release@v2
7475
with:
75-
files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
76+
files: ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
77+
78+
79+
push-ui:
80+
runs-on: ubuntu-latest
81+
steps:
82+
- uses: actions/checkout@v4
83+
84+
- name: Set up JDK 17
85+
uses: actions/setup-java@v4
86+
with:
87+
java-version: "17"
88+
distribution: "temurin"
89+
90+
- uses: gradle/actions/setup-gradle@v4
91+
with:
92+
gradle-version: 8.7
93+
94+
- name: Generate exe
95+
run: ./gradlew clean createExe
96+
env:
97+
DOCKER_ENABLE_SECURITY: false
98+
STIRLING_PDF_DESKTOP_UI: true
99+
100+
- name: Get version number
101+
id: versionNumber
102+
run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
103+
104+
- name: Upload Assets binarie
105+
uses: actions/upload-artifact@v4
106+
with:
107+
path: ./build/launch4j/Stirling-PDF.exe
108+
name: Stirling-PDF.exe
109+
overwrite: true
110+
retention-days: 1
111+
if-no-files-found: error
112+
113+
- name: Upload binaries to release
114+
uses: softprops/action-gh-release@v2
115+
with:
116+
files: ./build/launch4j/Stirling-PDF.exe

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,4 @@ out/
161161
.pytest_cache
162162
.ipynb_checkpoints
163163

164+
**/jcef-bundle/

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Main stage
2-
FROM alpine:3.21.0
2+
FROM alpine:3.20.3
33

44
# Copy necessary files
55
COPY scripts /scripts

‎Dockerfile-fat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN DOCKER_ENABLE_SECURITY=true \
1212
./gradlew clean build
1313

1414
# Main stage
15-
FROM alpine:3.21.0
15+
FROM alpine:3.20.3
1616

1717
# Copy necessary files
1818
COPY scripts /scripts

0 commit comments

Comments
 (0)