Skip to content

Commit e562f33

Browse files
Merge branch 'main' into web/policy-wizard-3
* main: (88 commits) ci: mirror repo to internal repo (#12160) core: bump goauthentik.io/api/v3 from 3.2024102.2 to 3.2024104.1 (#12149) core: bump debugpy from 1.8.8 to 1.8.9 (#12150) core: bump webauthn from 2.2.0 to 2.3.0 (#12151) core: bump pydantic from 2.10.0 to 2.10.1 (#12152) translate: Updates for file web/xliff/en.xlf in zh_CN (#12156) translate: Updates for file web/xliff/en.xlf in zh-Hans (#12157) core: bump sentry-sdk from 2.18.0 to 2.19.0 (#12153) web: bump API Client version (#12147) root: Backport version change (#12146) website/docs: update info about footer links to match new UI (#12120) website/docs: prepare release notes (#12142) providers/oauth2: fix migration (#12138) providers/oauth2: fix migration dependencies (#12123) web: bump API Client version (#12129) providers/oauth2: fix redirect uri input (#12122) providers/proxy: fix redirect_uri (#12121) website/docs: prepare release notes (#12119) web: bump API Client version (#12118) security: fix CVE 2024 52289 (#12113) ...
2 parents 29362ea + 3d5a189 commit e562f33

File tree

165 files changed

+7559
-3407
lines changed

Some content is hidden

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

165 files changed

+7559
-3407
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2024.10.1
2+
current_version = 2024.10.4
33
tag = True
44
commit = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?

.github/actions/docker-push-variables/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ inputs:
1111
description: "Docker image arch"
1212

1313
outputs:
14-
shouldBuild:
15-
description: "Whether to build image or not"
16-
value: ${{ steps.ev.outputs.shouldBuild }}
14+
shouldPush:
15+
description: "Whether to push the image or not"
16+
value: ${{ steps.ev.outputs.shouldPush }}
1717

1818
sha:
1919
description: "sha"

.github/actions/docker-push-variables/push_vars.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
parser = configparser.ConfigParser()
88
parser.read(".bumpversion.cfg")
99

10-
should_build = str(len(os.environ.get("DOCKER_USERNAME", "")) > 0).lower()
10+
# Decide if we should push the image or not
11+
should_push = True
12+
if len(os.environ.get("DOCKER_USERNAME", "")) > 0:
13+
# Don't push if we don't have DOCKER_USERNAME, i.e. no secrets are available
14+
should_push = False
15+
if os.environ.get("GITHUB_REPOSITORY").lower() == "goauthentik/authentik-internal":
16+
# Don't push on the internal repo
17+
should_push = False
1118

1219
branch_name = os.environ["GITHUB_REF"]
1320
if os.environ.get("GITHUB_HEAD_REF", "") != "":
@@ -64,7 +71,7 @@ def get_attest_image_names(image_with_tags: list[str]):
6471

6572

6673
with open(os.environ["GITHUB_OUTPUT"], "a+", encoding="utf-8") as _output:
67-
print(f"shouldBuild={should_build}", file=_output)
74+
print(f"shouldPush={str(should_push).lower()}", file=_output)
6875
print(f"sha={sha}", file=_output)
6976
print(f"version={version}", file=_output)
7077
print(f"prerelease={prerelease}", file=_output)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
workflow_dispatch:
88
jobs:
99
build:
10+
if: ${{ github.repository != 'goauthentik/authentik-internal' }}
1011
runs-on: ubuntu-latest
1112
permissions:
1213
id-token: write

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
workflow_dispatch:
88
jobs:
99
build:
10+
if: ${{ github.repository != 'goauthentik/authentik-internal' }}
1011
runs-on: ubuntu-latest
1112
steps:
1213
- id: generate_token

.github/workflows/ci-main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
poetry run make test
117117
poetry run coverage xml
118118
- if: ${{ always() }}
119-
uses: codecov/codecov-action@v4
119+
uses: codecov/codecov-action@v5
120120
with:
121121
flags: unit
122122
token: ${{ secrets.CODECOV_TOKEN }}
@@ -140,7 +140,7 @@ jobs:
140140
poetry run coverage run manage.py test tests/integration
141141
poetry run coverage xml
142142
- if: ${{ always() }}
143-
uses: codecov/codecov-action@v4
143+
uses: codecov/codecov-action@v5
144144
with:
145145
flags: integration
146146
token: ${{ secrets.CODECOV_TOKEN }}
@@ -198,7 +198,7 @@ jobs:
198198
poetry run coverage run manage.py test ${{ matrix.job.glob }}
199199
poetry run coverage xml
200200
- if: ${{ always() }}
201-
uses: codecov/codecov-action@v4
201+
uses: codecov/codecov-action@v5
202202
with:
203203
flags: e2e
204204
token: ${{ secrets.CODECOV_TOKEN }}
@@ -252,7 +252,7 @@ jobs:
252252
image-name: ghcr.io/goauthentik/dev-server
253253
image-arch: ${{ matrix.arch }}
254254
- name: Login to Container Registry
255-
if: ${{ steps.ev.outputs.shouldBuild == 'true' }}
255+
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
256256
uses: docker/login-action@v3
257257
with:
258258
registry: ghcr.io
@@ -269,15 +269,15 @@ jobs:
269269
GEOIPUPDATE_ACCOUNT_ID=${{ secrets.GEOIPUPDATE_ACCOUNT_ID }}
270270
GEOIPUPDATE_LICENSE_KEY=${{ secrets.GEOIPUPDATE_LICENSE_KEY }}
271271
tags: ${{ steps.ev.outputs.imageTags }}
272-
push: ${{ steps.ev.outputs.shouldBuild == 'true' }}
272+
push: ${{ steps.ev.outputs.shouldPush == 'true' }}
273273
build-args: |
274274
GIT_BUILD_HASH=${{ steps.ev.outputs.sha }}
275275
cache-from: type=registry,ref=ghcr.io/goauthentik/dev-server:buildcache
276-
cache-to: ${{ steps.ev.outputs.shouldBuild == 'true' && 'type=registry,ref=ghcr.io/goauthentik/dev-server:buildcache,mode=max' || '' }}
276+
cache-to: ${{ steps.ev.outputs.shouldPush == 'true' && 'type=registry,ref=ghcr.io/goauthentik/dev-server:buildcache,mode=max' || '' }}
277277
platforms: linux/${{ matrix.arch }}
278278
- uses: actions/attest-build-provenance@v1
279279
id: attest
280-
if: ${{ steps.ev.outputs.shouldBuild == 'true' }}
280+
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
281281
with:
282282
subject-name: ${{ steps.ev.outputs.attestImageNames }}
283283
subject-digest: ${{ steps.push.outputs.digest }}
@@ -303,7 +303,7 @@ jobs:
303303
with:
304304
image-name: ghcr.io/goauthentik/dev-server
305305
- name: Comment on PR
306-
if: ${{ steps.ev.outputs.shouldBuild == 'true' }}
306+
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
307307
uses: ./.github/actions/comment-pr-instructions
308308
with:
309309
tag: ${{ steps.ev.outputs.imageMainTag }}

.github/workflows/ci-outpost.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
image-name: ghcr.io/goauthentik/dev-${{ matrix.type }}
9292
- name: Login to Container Registry
93-
if: ${{ steps.ev.outputs.shouldBuild == 'true' }}
93+
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
9494
uses: docker/login-action@v3
9595
with:
9696
registry: ghcr.io
@@ -104,16 +104,16 @@ jobs:
104104
with:
105105
tags: ${{ steps.ev.outputs.imageTags }}
106106
file: ${{ matrix.type }}.Dockerfile
107-
push: ${{ steps.ev.outputs.shouldBuild == 'true' }}
107+
push: ${{ steps.ev.outputs.shouldPush == 'true' }}
108108
build-args: |
109109
GIT_BUILD_HASH=${{ steps.ev.outputs.sha }}
110110
platforms: linux/amd64,linux/arm64
111111
context: .
112112
cache-from: type=registry,ref=ghcr.io/goauthentik/dev-${{ matrix.type }}:buildcache
113-
cache-to: ${{ steps.ev.outputs.shouldBuild == 'true' && format('type=registry,ref=ghcr.io/goauthentik/dev-{0}:buildcache,mode=max', matrix.type) || '' }}
113+
cache-to: ${{ steps.ev.outputs.shouldPush == 'true' && format('type=registry,ref=ghcr.io/goauthentik/dev-{0}:buildcache,mode=max', matrix.type) || '' }}
114114
- uses: actions/attest-build-provenance@v1
115115
id: attest
116-
if: ${{ steps.ev.outputs.shouldBuild == 'true' }}
116+
if: ${{ steps.ev.outputs.shouldPush == 'true' }}
117117
with:
118118
subject-name: ${{ steps.ev.outputs.attestImageNames }}
119119
subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/gen-update-webauthn-mds.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111

1212
jobs:
1313
build:
14+
if: ${{ github.repository != 'goauthentik/authentik-internal' }}
1415
runs-on: ubuntu-latest
1516
steps:
1617
- id: generate_token

.github/workflows/ghcr-retention.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
clean-ghcr:
10+
if: ${{ github.repository != 'goauthentik/authentik-internal' }}
1011
name: Delete old unused container images
1112
runs-on: ubuntu-latest
1213
steps:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212

1313
jobs:
1414
publish-source-docs:
15+
if: ${{ github.repository != 'goauthentik/authentik-internal' }}
1516
runs-on: ubuntu-latest
1617
timeout-minutes: 120
1718
steps:

0 commit comments

Comments
 (0)