Skip to content

Commit 8bb5d57

Browse files
authored
Merge branch 'main' into feature/file-run-info-transit-and-notifications
2 parents d0a8b30 + 37a48aa commit 8bb5d57

92 files changed

Lines changed: 14363 additions & 12509 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
1-
# All PRs must be approved by Frooodle or Ludy87
2-
* @Frooodle @Ludy87 @jbrunton96 @ConnorYoh
1+
# Review ownership is assigned to teams where possible.
2+
# Teams can only contain org members, so outside collaborators are listed by hand.
3+
#
4+
# @Stirling-Tools/maintainers - Frooodle, jbrunton96, ConnorYoh
5+
# @Stirling-Tools/backend-reviewers - Frooodle, jbrunton96, ConnorYoh
6+
# @Stirling-Tools/frontend-reviewers - Frooodle, jbrunton96, ConnorYoh, reecebrowne, EthanHealy01
7+
# @Stirling-Tools/devops-reviewers - Frooodle, jbrunton96, ConnorYoh
8+
# @Stirling-Tools/all - all of the above
9+
#
10+
# Outside collaborators (need Write access to count as owners): @Ludy87 @balazs-szucs
311

4-
# Backend
5-
/app/** @DarioGii @Frooodle @Ludy87 @jbrunton96 @ConnorYoh @balazs-szucs
12+
# Default owners for everything
13+
* @Stirling-Tools/maintainers @Ludy87
614

7-
#V2 frontend
8-
/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @balazs-szucs
9-
/app/core/src/main/resources/static/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87 @balazs-szucs
15+
# Backend
16+
/app/** @Stirling-Tools/backend-reviewers @Ludy87 @balazs-szucs
1017

11-
#V2 docker
12-
/docker/backend/** @Frooodle @Ludy87 @DarioGii
13-
/docker/frontend/** @reecebrowne @ConnorYoh @EthanHealy01 @jbrunton96 @Frooodle @Ludy87
14-
/docker/compose/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87
18+
# V2 frontend
19+
/frontend/** @Stirling-Tools/frontend-reviewers @balazs-szucs
20+
/app/core/src/main/resources/static/** @Stirling-Tools/frontend-reviewers @Ludy87 @balazs-szucs
1521

22+
# V2 docker
23+
/docker/backend/** @Stirling-Tools/devops-reviewers @Ludy87
24+
/docker/frontend/** @Stirling-Tools/frontend-reviewers @Stirling-Tools/devops-reviewers @Ludy87
25+
/docker/compose/** @Stirling-Tools/frontend-reviewers @Stirling-Tools/devops-reviewers @Ludy87
1626

17-
#GHA (All users)
18-
/.github/** @reecebrowne @ConnorYoh @EthanHealy01 @DarioGii @jbrunton96 @Frooodle @Ludy87 @balazs-szucs
27+
# GHA (all users)
28+
/.github/** @Stirling-Tools/all @Ludy87 @balazs-szucs

.github/config/repo_devs.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"LaserKaspar",
1212
"sbplat",
1313
"reecebrowne",
14-
"DarioGii",
1514
"ConnorYoh",
1615
"EthanHealy01",
1716
"jbrunton96",

.github/dependabot.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ updates:
7373
- "react-dom"
7474
- "@types/react"
7575
- "@types/react-dom"
76-
typescript-eslint:
77-
patterns:
78-
- "@typescript-eslint/*"
79-
- "typescript-eslint"
80-
eslint:
81-
patterns:
82-
- "eslint"
83-
- "@eslint/*"
8476
vite:
8577
patterns:
8678
- "vite"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
fi
8787
fi
8888
else
89-
auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "DarioGii" "ConnorYoh" "EthanHealy01" "jbrunton96" "balazs-szucs")
89+
auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "ConnorYoh" "EthanHealy01" "jbrunton96" "balazs-szucs")
9090
is_auth=false; for u in "${auth_users[@]}"; do [ "$u" = "$PR_AUTHOR" ] && is_auth=true && break; done
9191
if [ "$is_auth" = true ]; then
9292
should=true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
github.event.comment.user.login == 'Ludy87' ||
5555
github.event.comment.user.login == 'balazs-szucs' ||
5656
github.event.comment.user.login == 'reecebrowne' ||
57-
github.event.comment.user.login == 'DarioGii' ||
5857
github.event.comment.user.login == 'EthanHealy01' ||
5958
github.event.comment.user.login == 'jbrunton96' ||
6059
github.event.comment.user.login == 'ConnorYoh'

.github/workflows/build-enterprise.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ jobs:
330330
- name: Checkout repository
331331
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
332332
- name: Set up Python
333-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
333+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
334334
with:
335335
python-version: "3.12"
336336
cache: "pip"

.github/workflows/multiOSReleases.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ jobs:
475475
fi
476476
477477
- name: Build Tauri app
478-
uses: tauri-apps/tauri-action@84b9d35b5fc46c1e45415bdb6144030364f7ebc5 # v0.6.2
478+
uses: tauri-apps/tauri-action@1deb371b0cd8bd54025b384f1cd735e725c4060f # v1.0.0
479479
env:
480480
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
481481
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -505,7 +505,6 @@ jobs:
505505
projectPath: ./frontend/editor
506506
tauriScript: npx tauri
507507
args: ${{ matrix.args }}
508-
updaterJsonKeepUniversal: true
509508

510509
# Bundled libwayland conflicts with the host's on some distros (Fedora
511510
# Wayland: EGL_BAD_PARAMETER, blank window - #6878). Repack without it,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Generate tags for base image
7777
id: meta
78-
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
78+
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
7979
with:
8080
images: |
8181
${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf-base

.github/workflows/push-docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
- name: Generate tags for latest
126126
id: meta
127127
if: env.RUN_MAIN_APP == 'true'
128-
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
128+
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
129129
with:
130130
images: |
131131
${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
@@ -173,7 +173,7 @@ jobs:
173173
174174
- name: Generate tags for latest-fat
175175
id: meta-fat
176-
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
176+
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
177177
if: env.RUN_MAIN_APP == 'true' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/testMain'
178178
with:
179179
images: |
@@ -217,7 +217,7 @@ jobs:
217217
218218
- name: Generate tags for ultra-lite
219219
id: meta-lite
220-
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
220+
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
221221
if: env.RUN_MAIN_APP == 'true' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/testMain'
222222
with:
223223
images: |

.github/workflows/tauri-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ jobs:
386386
387387
- name: Build Tauri app (signed)
388388
if: env.SIGN_BUNDLE == 'true'
389-
uses: tauri-apps/tauri-action@84b9d35b5fc46c1e45415bdb6144030364f7ebc5 # v0.6.2
389+
uses: tauri-apps/tauri-action@1deb371b0cd8bd54025b384f1cd735e725c4060f # v1.0.0
390390
env:
391391
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
392392
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -421,7 +421,7 @@ jobs:
421421

422422
- name: Build Tauri app (unsigned)
423423
if: env.SIGN_BUNDLE != 'true'
424-
uses: tauri-apps/tauri-action@84b9d35b5fc46c1e45415bdb6144030364f7ebc5 # v0.6.2
424+
uses: tauri-apps/tauri-action@1deb371b0cd8bd54025b384f1cd735e725c4060f # v1.0.0
425425
env:
426426
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
427427
SIGN: "0"
@@ -447,7 +447,7 @@ jobs:
447447
- name: Build Tauri app (Linux AppImage)
448448
if: matrix.platform == 'ubuntu-22.04' && !inputs.minimal
449449
continue-on-error: true
450-
uses: tauri-apps/tauri-action@84b9d35b5fc46c1e45415bdb6144030364f7ebc5 # v0.6.2
450+
uses: tauri-apps/tauri-action@1deb371b0cd8bd54025b384f1cd735e725c4060f # v1.0.0
451451
env:
452452
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
453453
SIGN: ${{ (inputs.sign && env.RELEASE_GPG_PRIVATE_KEY != '' && github.ref == 'refs/heads/main') && '1' || '0' }}

0 commit comments

Comments
 (0)