From 4e500030d1e0ea5d316ec8f9f0fb366e2acc627d Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Tue, 12 Aug 2025 18:49:02 +0200 Subject: [PATCH] ci: release branch off: various fixes (#16137) --- .github/workflows/release-branch-off.yml | 6 ++---- tests/integration/test_outpost_docker.py | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-branch-off.yml b/.github/workflows/release-branch-off.yml index 920470e51f..e8e0fbd931 100644 --- a/.github/workflows/release-branch-off.yml +++ b/.github/workflows/release-branch-off.yml @@ -35,8 +35,8 @@ jobs: - name: Create version branch run: | current_major_version="$(uv version --short | grep -oE "^[0-9]{4}\.[0-9]{1,2}")" - git checkout -b "version/${current_major_version}" - git push origin "version/${current_major_version}" + git checkout -b "version-${current_major_version}" + git push origin "version-${current_major_version}" bump-version-pr: name: Open version bump PR needs: @@ -55,8 +55,6 @@ jobs: token: ${{ steps.generate_token.outputs.token }} - name: Setup authentik env uses: ./.github/actions/setup - with: - dependencies: python,node - name: Bump version run: "make bump version=${{ inputs.next_version }}.0-rc1" - name: Create pull request diff --git a/tests/integration/test_outpost_docker.py b/tests/integration/test_outpost_docker.py index 5ec3a93b64..7aa2299e16 100644 --- a/tests/integration/test_outpost_docker.py +++ b/tests/integration/test_outpost_docker.py @@ -10,6 +10,7 @@ from docker.types.healthcheck import Healthcheck from authentik.core.tests.utils import create_test_flow from authentik.crypto.models import CertificateKeyPair +from authentik.lib.config import CONFIG from authentik.outposts.controllers.docker import DockerController from authentik.outposts.models import ( DockerServiceConnection, @@ -88,6 +89,7 @@ class OutpostDockerTests(DockerTestCase, ChannelsLiveServerTestCase): pass @pytest.mark.timeout(120) + @CONFIG.patch("outposts.container_image_base", "ghcr.io/goauthentik/dev-proxy:gh-main") def test_docker_controller(self): """test that deployment requires update""" controller = DockerController(self.outpost, self.service_connection)