Skip to content

Commit 301ae72

Browse files
authored
Merge branch 'main' into website/integrations--update-jellyfin
2 parents 9acc45d + 3348ab3 commit 301ae72

File tree

1,129 files changed

+160429
-11722
lines changed

Some content is hidden

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

1,129 files changed

+160429
-11722
lines changed

.github/actions/cherry-pick/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ runs:
215215
--head "$CHERRY_PICK_BRANCH" \
216216
--label "cherry-pick")
217217
218+
# Assign the PR to the original author
219+
gh pr edit "$NEW_PR" --add-assignee "$PR_AUTHOR" || true
220+
218221
echo "✅ Created cherry-pick PR $NEW_PR for $TARGET_BRANCH"
219222
220223
# Comment on original PR
@@ -254,6 +257,9 @@ runs:
254257
--head "$CHERRY_PICK_BRANCH" \
255258
--label "cherry-pick")
256259
260+
# Assign the PR to the original author
261+
gh pr edit "$NEW_PR" --add-assignee "$PR_AUTHOR" || true
262+
257263
echo "⚠️ Created conflict resolution PR $NEW_PR for $TARGET_BRANCH"
258264
259265
# Comment on original PR

.github/actions/setup/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ runs:
1818
run: |
1919
sudo apt-get remove --purge man-db
2020
sudo apt-get update
21-
sudo apt-get install --no-install-recommends -y libpq-dev openssl libxmlsec1-dev pkg-config gettext libkrb5-dev krb5-kdc krb5-user krb5-admin-server
21+
sudo apt-get install --no-install-recommends -y libpq-dev openssl libxmlsec1-dev pkg-config gettext krb5-multidev libkrb5-dev heimdal-multidev libclang-dev krb5-kdc krb5-user krb5-admin-server
2222
sudo rm -rf /usr/local/lib/android
2323
- name: Install uv
2424
if: ${{ contains(inputs.dependencies, 'python') }}
25-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v5
25+
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v5
2626
with:
2727
enable-cache: true
2828
- name: Setup python
2929
if: ${{ contains(inputs.dependencies, 'python') }}
30-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v5
30+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v5
3131
with:
3232
python-version-file: "pyproject.toml"
3333
- name: Install Python deps
@@ -36,7 +36,7 @@ runs:
3636
run: uv sync --all-extras --dev --frozen
3737
- name: Setup node
3838
if: ${{ contains(inputs.dependencies, 'node') }}
39-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v4
39+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v4
4040
with:
4141
node-version-file: web/package.json
4242
cache: "npm"

.github/actions/setup/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
- 8020:8000
2323
volumes:
2424
- s3-data:/usr/src/app/localData
25-
- s3-metadata:/usr/scr/app/localMetadata
25+
- s3-metadata:/usr/src/app/localMetadata
2626
restart: always
2727

2828
volumes:

.github/workflows/_reusable-docker-build-single.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# Needed for checkout
4343
contents: read
4444
steps:
45-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
45+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
4646
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
4747
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
4848
- name: prepare variables
@@ -56,32 +56,31 @@ jobs:
5656
release: ${{ inputs.release }}
5757
- name: Login to Docker Hub
5858
if: ${{ inputs.registry_dockerhub }}
59-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
59+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
6060
with:
6161
username: ${{ secrets.DOCKER_CORP_USERNAME }}
6262
password: ${{ secrets.DOCKER_CORP_PASSWORD }}
6363
- name: Login to GitHub Container Registry
6464
if: ${{ inputs.registry_ghcr }}
65-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
65+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
6666
with:
6767
registry: ghcr.io
6868
username: ${{ github.repository_owner }}
6969
password: ${{ secrets.GITHUB_TOKEN }}
70-
- name: make empty clients
71-
if: ${{ inputs.release }}
72-
run: |
73-
mkdir -p ./gen-ts-api
74-
mkdir -p ./gen-go-api
75-
- name: Setup node
76-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
70+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
7771
with:
7872
node-version-file: web/package.json
7973
cache: "npm"
8074
cache-dependency-path: web/package-lock.json
81-
- name: generate ts client
82-
run: make gen-client-ts
75+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
76+
with:
77+
go-version-file: "go.mod"
78+
- name: Generate API Clients
79+
run: |
80+
make gen-client-ts
81+
make gen-client-go
8382
- name: Build Docker Image
84-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
83+
uses: docker/build-push-action@601a80b39c9405e50806ae38af30926f9d957c47 # v6
8584
id: push
8685
with:
8786
context: .
@@ -96,7 +95,7 @@ jobs:
9695
platforms: linux/${{ inputs.image_arch }}
9796
cache-from: type=registry,ref=${{ steps.ev.outputs.attestImageNames }}:buildcache-${{ inputs.image_arch }}
9897
cache-to: ${{ steps.ev.outputs.cacheTo }}
99-
- uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3
98+
- uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3
10099
id: attest
101100
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
102101
with:

.github/workflows/_reusable-docker-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
tags: ${{ steps.ev.outputs.imageTagsJSON }}
5050
shouldPush: ${{ steps.ev.outputs.shouldPush }}
5151
steps:
52-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
52+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
5353
- name: prepare variables
5454
uses: ./.github/actions/docker-push-variables
5555
id: ev
@@ -69,7 +69,7 @@ jobs:
6969
matrix:
7070
tag: ${{ fromJson(needs.get-tags.outputs.tags) }}
7171
steps:
72-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
72+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
7373
- name: prepare variables
7474
uses: ./.github/actions/docker-push-variables
7575
id: ev
@@ -79,25 +79,25 @@ jobs:
7979
image-name: ${{ inputs.image_name }}
8080
- name: Login to Docker Hub
8181
if: ${{ inputs.registry_dockerhub }}
82-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
82+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
8383
with:
8484
username: ${{ secrets.DOCKER_CORP_USERNAME }}
8585
password: ${{ secrets.DOCKER_CORP_PASSWORD }}
8686
- name: Login to GitHub Container Registry
8787
if: ${{ inputs.registry_ghcr }}
88-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
88+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
8989
with:
9090
registry: ghcr.io
9191
username: ${{ github.repository_owner }}
9292
password: ${{ secrets.GITHUB_TOKEN }}
93-
- uses: int128/docker-manifest-create-action@6cdd53a8337cd50bc3ef8c7016579d8d460edd94 # v2
93+
- uses: int128/docker-manifest-create-action@1a059c021f1d5e9f2bd39de745d5dd3a0ef6df90 # v2
9494
id: build
9595
with:
9696
tags: ${{ matrix.tag }}
9797
sources: |
9898
${{ steps.ev.outputs.attestImageNames }}@${{ needs.build-server-amd64.outputs.image-digest }}
9999
${{ steps.ev.outputs.attestImageNames }}@${{ needs.build-server-arm64.outputs.image-digest }}
100-
- uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3
100+
- uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3
101101
id: attest
102102
with:
103103
subject-name: ${{ steps.ev.outputs.attestImageNames }}

.github/workflows/api-ts-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
app-id: ${{ secrets.GH_APP_ID }}
2424
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
2626
with:
2727
token: ${{ steps.generate_token.outputs.token }}
28-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
28+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
2929
with:
3030
node-version-file: web/package.json
3131
registry-url: "https://registry.npmjs.org"
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
export VERSION=`node -e 'console.log(require("../gen-ts-api/package.json").version)'`
4848
npm i @goauthentik/api@$VERSION
49-
- uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v7
49+
- uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v7
5050
id: cpr
5151
with:
5252
token: ${{ steps.generate_token.outputs.token }}

.github/workflows/ci-api-docs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
command:
2222
- prettier-check
2323
steps:
24-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
2525
- name: Install Dependencies
2626
working-directory: website/
2727
run: npm ci
@@ -32,16 +32,16 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
36-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
36+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
3737
with:
3838
node-version-file: website/package.json
3939
cache: "npm"
4040
cache-dependency-path: website/package-lock.json
4141
- working-directory: website/
4242
name: Install Dependencies
4343
run: npm ci
44-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
44+
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4
4545
with:
4646
path: |
4747
${{ github.workspace }}/website/api/.docusaurus
@@ -66,12 +66,12 @@ jobs:
6666
- lint
6767
- build
6868
steps:
69-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
69+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
7070
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v5
7171
with:
7272
name: api-docs
7373
path: website/api/build
74-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
74+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
7575
with:
7676
node-version-file: website/package.json
7777
cache: "npm"

.github/workflows/ci-aws-cfn.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
check-changes-applied:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
2525
- name: Setup authentik env
2626
uses: ./.github/actions/setup
27-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
27+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
2828
with:
2929
node-version-file: lifecycle/aws/package.json
3030
cache: "npm"

.github/workflows/ci-docs-source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
timeout-minutes: 120
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
2020
- name: Setup authentik env
2121
uses: ./.github/actions/setup
2222
- name: generate docs

.github/workflows/ci-docs.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ on:
1515
jobs:
1616
lint:
1717
runs-on: ubuntu-latest
18+
env:
19+
NODE_ENV: production
1820
strategy:
1921
fail-fast: false
2022
matrix:
2123
command:
2224
- prettier-check
2325
steps:
24-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
2527
- name: Install dependencies
2628
working-directory: website/
2729
run: npm ci
@@ -30,10 +32,11 @@ jobs:
3032
run: npm run ${{ matrix.command }}
3133
build-docs:
3234
runs-on: ubuntu-latest
33-
35+
env:
36+
NODE_ENV: production
3437
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
36-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
38+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
39+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
3740
with:
3841
node-version-file: website/package.json
3942
cache: "npm"
@@ -46,10 +49,11 @@ jobs:
4649
run: npm run build
4750
build-integrations:
4851
runs-on: ubuntu-latest
49-
52+
env:
53+
NODE_ENV: production
5054
steps:
51-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
52-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v5
55+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
56+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v5
5357
with:
5458
node-version-file: website/package.json
5559
cache: "npm"
@@ -69,7 +73,7 @@ jobs:
6973
id-token: write
7074
attestations: write
7175
steps:
72-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5
76+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v5
7377
with:
7478
ref: ${{ github.event.pull_request.head.sha }}
7579
- name: Set up QEMU
@@ -85,14 +89,14 @@ jobs:
8589
image-name: ghcr.io/goauthentik/dev-docs
8690
- name: Login to Container Registry
8791
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
88-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
92+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
8993
with:
9094
registry: ghcr.io
9195
username: ${{ github.repository_owner }}
9296
password: ${{ secrets.GITHUB_TOKEN }}
9397
- name: Build Docker Image
9498
id: push
95-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
99+
uses: docker/build-push-action@601a80b39c9405e50806ae38af30926f9d957c47 # v6
96100
with:
97101
tags: ${{ steps.ev.outputs.imageTags }}
98102
file: website/Dockerfile
@@ -101,7 +105,7 @@ jobs:
101105
context: .
102106
cache-from: type=registry,ref=ghcr.io/goauthentik/dev-docs:buildcache
103107
cache-to: ${{ steps.ev.outputs.shouldPush == 'true' && 'type=registry,ref=ghcr.io/goauthentik/dev-docs:buildcache,mode=max' || '' }}
104-
- uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3
108+
- uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3
105109
id: attest
106110
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
107111
with:

0 commit comments

Comments
 (0)