Skip to content

Commit 3d852fd

Browse files
FrooodleFrooodle
authored
Merge branch 'main' into playwright
2 parents c9deff9 + 5cfb773 commit 3d852fd

56 files changed

Lines changed: 68853 additions & 66028 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/aur/stirling-pdf-bin/PKGBUILD renamed to .github/aur/stirling-pdf-desktop/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Maintainer: Stirling PDF Inc <contact@stirlingpdf.com>
2-
pkgname=stirling-pdf-bin
2+
pkgname=stirling-pdf-desktop
33
pkgver=2.7.3
44
pkgrel=1
5-
pkgdesc="Locally hosted, web-based PDF manipulation tool (desktop app, prebuilt binary)"
5+
pkgdesc="Locally hosted, web-based PDF manipulation tool (Tauri desktop app, official Stirling PDF Inc build)"
66
arch=('x86_64')
77
url="https://www.stirling.com"
88
license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
9-
depends=('gtk3' 'webkit2gtk' 'libappindicator-gtk3')
9+
depends=('gtk3' 'webkit2gtk-4.1' 'libappindicator-gtk3')
1010
provides=('stirling-pdf')
11-
conflicts=('stirling-pdf' 'stirling-pdf-git')
11+
conflicts=('stirling-pdf' 'stirling-pdf-git' 'stirling-pdf-bin')
1212
options=('!strip')
1313

1414
source_x86_64=("${pkgname}-${pkgver}.deb::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-linux-x86_64.deb")

‎.github/aur/stirling-pdf-server-bin/PKGBUILD‎

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,27 @@ pkgdesc="Locally hosted, web-based PDF manipulation tool (server JAR, prebuilt)"
66
arch=('any')
77
url="https://www.stirling.com"
88
license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
9-
depends=('java-runtime>=21')
9+
depends=('java-runtime>=25')
1010
provides=('stirling-pdf-server')
1111
conflicts=('stirling-pdf-server' 'stirling-pdf-server-git')
1212
backup=('etc/stirling-pdf-server/settings.yml')
1313

14-
source=("Stirling-PDF-with-login-${pkgver}.jar::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-with-login.jar"
15-
"stirling-pdf-server.service"
16-
"stirling-pdf-server.sysusers"
17-
"stirling-pdf-server.tmpfiles")
18-
sha256sums=('PLACEHOLDER_JAR_SHA256'
19-
'PLACEHOLDER_SERVICE_SHA256'
20-
'PLACEHOLDER_SYSUSERS_SHA256'
21-
'PLACEHOLDER_TMPFILES_SHA256')
14+
source=("Stirling-PDF-with-login-${pkgver}.jar::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-with-login.jar")
15+
sha256sums=('PLACEHOLDER_JAR_SHA256')
2216

23-
prepare() {
24-
cat > stirling-pdf-server.service << 'EOF'
17+
package() {
18+
# JAR
19+
install -Dm644 "Stirling-PDF-with-login-${pkgver}.jar" \
20+
"${pkgdir}/usr/share/stirling-pdf-server/stirling-pdf-server.jar"
21+
22+
# Wrapper script
23+
install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stirling-pdf-server" << 'EOF'
24+
#!/bin/sh
25+
exec java $JAVA_OPTS -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar "$@"
26+
EOF
27+
28+
# systemd unit
29+
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/systemd/system/stirling-pdf-server.service" << 'EOF'
2530
[Unit]
2631
Description=Stirling-PDF Server
2732
After=network.target
@@ -43,36 +48,16 @@ Environment=JAVA_OPTS=-Xmx512m
4348
WantedBy=multi-user.target
4449
EOF
4550

46-
cat > stirling-pdf-server.sysusers << 'EOF'
51+
# sysusers
52+
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/stirling-pdf-server.conf" << 'EOF'
4753
u stirling-pdf - "Stirling-PDF Server" /var/lib/stirling-pdf-server -
4854
EOF
4955

50-
cat > stirling-pdf-server.tmpfiles << 'EOF'
56+
# tmpfiles
57+
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/stirling-pdf-server.conf" << 'EOF'
5158
d /var/lib/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
5259
d /var/log/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
5360
EOF
54-
}
55-
56-
package() {
57-
# JAR
58-
install -Dm644 "Stirling-PDF-with-login-${pkgver}.jar" \
59-
"${pkgdir}/usr/share/stirling-pdf-server/stirling-pdf-server.jar"
60-
61-
# Wrapper script
62-
install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stirling-pdf-server" << 'EOF'
63-
#!/bin/sh
64-
exec java $JAVA_OPTS -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar "$@"
65-
EOF
66-
67-
# systemd unit
68-
install -Dm644 stirling-pdf-server.service \
69-
"${pkgdir}/usr/lib/systemd/system/stirling-pdf-server.service"
70-
71-
# sysusers / tmpfiles
72-
install -Dm644 stirling-pdf-server.sysusers \
73-
"${pkgdir}/usr/lib/sysusers.d/stirling-pdf-server.conf"
74-
install -Dm644 stirling-pdf-server.tmpfiles \
75-
"${pkgdir}/usr/lib/tmpfiles.d/stirling-pdf-server.conf"
7661

7762
# Default config stub
7863
install -dm755 "${pkgdir}/etc/stirling-pdf-server"
@@ -85,6 +70,8 @@ EOF
8570

8671
# License
8772
install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" << 'EOF'
88-
MIT License — see https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
73+
MIT License with proprietary carve-outs (open-core).
74+
SPDX: MIT AND LicenseRef-Stirling-PDF-Proprietary
75+
See https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
8976
EOF
9077
}

‎.github/workflows/PR-Auto-Deploy-V2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
190190
191191
- name: Login to Docker Hub
192-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
192+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
193193
with:
194194
username: ${{ secrets.DOCKER_HUB_USERNAME }}
195195
password: ${{ secrets.DOCKER_HUB_API }}
@@ -226,7 +226,7 @@ jobs:
226226
227227
- name: Build and push V2 image
228228
if: steps.check-image.outputs.exists == 'false'
229-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
229+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
230230
with:
231231
context: .
232232
file: ./docker/embedded/Dockerfile

‎.github/workflows/PR-Demo-Comment-with-react.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,13 @@ jobs:
236236
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
237237

238238
- name: Login to Docker Hub
239-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
239+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
240240
with:
241241
username: ${{ secrets.DOCKER_HUB_USERNAME }}
242242
password: ${{ secrets.DOCKER_HUB_API }}
243243

244244
- name: Build and push PR-specific image
245-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
245+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
246246
with:
247247
context: .
248248
file: ./docker/embedded/Dockerfile
@@ -257,7 +257,7 @@ jobs:
257257

258258
- name: Build and push engine image
259259
if: needs.check-comment.outputs.enable_prototypes == 'true'
260-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
260+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
261261
with:
262262
context: ./engine
263263
file: ./engine/Dockerfile

‎.github/workflows/ai-engine.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2525

2626
- name: Install uv
27-
uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
27+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
2828
with:
2929
enable-cache: true
3030

‎.github/workflows/aur-publish.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,52 +77,52 @@ jobs:
7777
- name: Checkout repository (for PKGBUILD templates)
7878
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
7979

80-
- name: Update stirling-pdf-bin PKGBUILD
80+
- name: Update stirling-pdf-desktop PKGBUILD
8181
env:
8282
VERSION: ${{ needs.get-release-info.outputs.version }}
8383
DEB_SHA: ${{ needs.get-release-info.outputs.deb_sha256 }}
8484
run: |
85-
PKGBUILD=".github/aur/stirling-pdf-bin/PKGBUILD"
85+
PKGBUILD=".github/aur/stirling-pdf-desktop/PKGBUILD"
8686
sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
8787
sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
8888
sed -i "s/'PLACEHOLDER_DEB_SHA256'/'${DEB_SHA}'/" "$PKGBUILD"
8989
90-
- name: Update stirling-pdf-server-bin PKGBUILD
91-
env:
92-
VERSION: ${{ needs.get-release-info.outputs.version }}
93-
JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
94-
run: |
95-
PKGBUILD=".github/aur/stirling-pdf-server-bin/PKGBUILD"
96-
sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
97-
sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
98-
sed -i "s/'PLACEHOLDER_JAR_SHA256'/'${JAR_SHA}'/" "$PKGBUILD"
90+
# Disabled until we sort out the server packaging story.
91+
# The third-party stirling-pdf-bin on AUR currently covers a similar use case.
92+
# - name: Update stirling-pdf-server-bin PKGBUILD
93+
# env:
94+
# VERSION: ${{ needs.get-release-info.outputs.version }}
95+
# JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
96+
# run: |
97+
# PKGBUILD=".github/aur/stirling-pdf-server-bin/PKGBUILD"
98+
# sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
99+
# sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
100+
# sed -i "s/'PLACEHOLDER_JAR_SHA256'/'${JAR_SHA}'/" "$PKGBUILD"
99101

100-
- name: Show updated PKGBUILDs (for dry-run visibility)
102+
- name: Show updated PKGBUILD (for dry-run visibility)
101103
run: |
102-
echo "--- stirling-pdf-bin PKGBUILD ---"
103-
cat .github/aur/stirling-pdf-bin/PKGBUILD
104-
echo ""
105-
echo "--- stirling-pdf-server-bin PKGBUILD ---"
106-
cat .github/aur/stirling-pdf-server-bin/PKGBUILD
104+
echo "--- stirling-pdf-desktop PKGBUILD ---"
105+
cat .github/aur/stirling-pdf-desktop/PKGBUILD
107106
108-
- name: Publish stirling-pdf-bin to AUR
107+
- name: Publish stirling-pdf-desktop to AUR
109108
if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
110-
uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
109+
uses: KSXGitHub/github-actions-deploy-aur@v4.1.2
111110
with:
112-
pkgname: stirling-pdf-bin
113-
pkgbuild: .github/aur/stirling-pdf-bin/PKGBUILD
111+
pkgname: stirling-pdf-desktop
112+
pkgbuild: .github/aur/stirling-pdf-desktop/PKGBUILD
114113
commit_username: Stirling PDF Inc
115114
commit_email: contact@stirlingpdf.com
116115
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
117116
commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
118117

119-
- name: Publish stirling-pdf-server-bin to AUR
120-
if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
121-
uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
122-
with:
123-
pkgname: stirling-pdf-server-bin
124-
pkgbuild: .github/aur/stirling-pdf-server-bin/PKGBUILD
125-
commit_username: Stirling PDF Inc
126-
commit_email: contact@stirlingpdf.com
127-
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
128-
commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
118+
# Disabled until we sort out the server packaging story.
119+
# - name: Publish stirling-pdf-server-bin to AUR
120+
# if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
121+
# uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
122+
# with:
123+
# pkgname: stirling-pdf-server-bin
124+
# pkgbuild: .github/aur/stirling-pdf-server-bin/PKGBUILD
125+
# commit_username: Stirling PDF Inc
126+
# commit_email: contact@stirlingpdf.com
127+
# ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
128+
# commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ jobs:
618618

619619
- name: Cucumber Test Report
620620
if: always()
621-
uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
621+
uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
622622
with:
623623
name: Cucumber Tests
624624
path: testing/cucumber/junit/*.xml
@@ -652,7 +652,7 @@ jobs:
652652
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
653653

654654
- name: Login to GitHub Container Registry
655-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
655+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
656656
with:
657657
registry: ghcr.io
658658
username: ${{ github.actor }}
@@ -725,7 +725,7 @@ jobs:
725725
fi
726726
727727
- name: Build ${{ matrix.docker-rev }}
728-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
728+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
729729
with:
730730
builder: ${{ steps.buildx.outputs.name }}
731731
context: .

‎.github/workflows/deploy-on-v2-commit.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ jobs:
8585
fi
8686
8787
- name: Login to Docker Hub
88-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
88+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
8989
with:
9090
username: ${{ secrets.DOCKER_HUB_USERNAME }}
9191
password: ${{ secrets.DOCKER_HUB_API }}
9292

9393
- name: Build and push frontend image
9494
if: steps.check-frontend.outputs.exists == 'false'
95-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
95+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
9696
with:
9797
context: .
9898
file: ./docker/frontend/Dockerfile
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Build and push backend image
109109
if: steps.check-backend.outputs.exists == 'false'
110-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
110+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
111111
with:
112112
context: .
113113
file: ./docker/backend/Dockerfile

‎.github/workflows/push-docker-base.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ jobs:
5050
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5151

5252
- name: Login to Docker Hub
53-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
53+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
5454
with:
5555
username: ${{ secrets.DOCKER_HUB_USERNAME }}
5656
password: ${{ secrets.DOCKER_HUB_API }}
5757

5858
- name: Login to GitHub Container Registry
59-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
59+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
6060
with:
6161
registry: ghcr.io
6262
username: ${{ github.actor }}
@@ -67,7 +67,7 @@ jobs:
6767
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
6868

6969
- name: Set up QEMU
70-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
70+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
7171

7272
- name: Convert repository owner to lowercase
7373
id: repoowner
@@ -85,7 +85,7 @@ jobs:
8585
8686
- name: Build and push base image
8787
id: build-push-base
88-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
88+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
8989
with:
9090
builder: ${{ steps.buildx.outputs.name }}
9191
context: docker/base

‎.github/workflows/push-docker.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ jobs:
8787
cosign-release: "v2.4.1"
8888

8989
- name: Login to Docker Hub
90-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
90+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
9191
with:
9292
username: ${{ secrets.DOCKER_HUB_USERNAME }}
9393
password: ${{ secrets.DOCKER_HUB_API }}
9494

9595
- name: Login to GitHub Container Registry
96-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
96+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
9797
with:
9898
registry: ghcr.io
9999
username: ${{ github.actor }}
@@ -122,7 +122,7 @@ jobs:
122122
123123
- name: Build and push Unified Dockerfile (latest variant)
124124
id: build-push-latest
125-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
125+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
126126
with:
127127
builder: ${{ steps.buildx.outputs.name }}
128128
context: .
@@ -169,7 +169,7 @@ jobs:
169169
170170
- name: Build and push Unified Dockerfile (fat variant)
171171
id: build-push-fat
172-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
172+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
173173
if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/testMain'
174174
with:
175175
builder: ${{ steps.buildx.outputs.name }}
@@ -213,7 +213,7 @@ jobs:
213213
214214
- name: Build and push Unified Dockerfile (ultra-lite variant)
215215
id: build-push-lite
216-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
216+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
217217
if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/testMain'
218218
with:
219219
builder: ${{ steps.buildx.outputs.name }}

0 commit comments

Comments
 (0)