From cb4ea1c9eec2d499ed55fa7c99684f9c2febd59d Mon Sep 17 00:00:00 2001
From: Amir Zarrinkafsh <3339418+nightah@users.noreply.github.com>
Date: Wed, 30 Sep 2026 10:04:16 +1000
Subject: [PATCH] ci: align renovate and crossbuild with authelia/authelia

Return Renovate to its default `renovate/` branch prefix. `branchPrefix` was set to `renovate-` only because `renovate/` could not be used verbatim as a container tag. That constraint never applied here, since this repository publishes no images and no branch name is turned into a tag or file name, and authelia/authelia has since dropped the override in authelia/authelia#13249. `branchPrefixOld` retires the branches left on the old prefix, and the draft bypass in `.buildkite/pipeline.sh` matches `^(dependabot|renovate)` and so covers both.

Take the Go toolchain, headers, goreleaser, grype and syft mounted into `authelia/crossbuild` from `/buildkite/.tools` rather than `/usr`, and drop the fixed `pam-authelia-crossbuild` container name, matching authelia/authelia#12726. On a Docker daemon shared between the agents on a host, bind mount sources are resolved against the host rather than inside the agent that requested them, so the agent image's own `/usr` is not visible there, and a fixed name collides whenever two builds run on the same host at once. The `unit-test` agents this step targets are the same ones authelia/authelia already builds on with these paths, so `/buildkite/.tools` is in place on them today.

Signed-off-by: Amir Zarrinkafsh <3339418+nightah@users.noreply.github.com>
---
 .buildkite/steps/build.sh | 11 +++++------
 .renovaterc               |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.buildkite/steps/build.sh b/.buildkite/steps/build.sh
index a74840e..1784156 100755
--- a/.buildkite/steps/build.sh
+++ b/.buildkite/steps/build.sh
@@ -12,7 +12,6 @@ fi
 
 echo "--- :goreleaser: Building pam_authelia via authelia/crossbuild"
 docker run --rm \
-  --name pam-authelia-crossbuild \
   --user 1000:1000 \
   -e GOPATH=/tmp/go \
   -e GOCACHE=/tmp/go-build \
@@ -24,10 +23,10 @@ docker run --rm \
   -v "/buildkite/.gnupg:/tmp/.gnupg" \
   -v "/buildkite/.go:/tmp/go" \
   -v "/buildkite/.sign:/tmp/sign" \
-  -v "/usr/lib/go:/usr/local/go" \
-  -v "/usr/local/include:/usr/local/include" \
-  -v "/usr/bin/goreleaser:/usr/local/bin/goreleaser" \
-  -v "/usr/local/bin/grype:/usr/local/bin/grype" \
-  -v "/usr/local/bin/syft:/usr/local/bin/syft" \
+  -v "/buildkite/.tools/go:/usr/local/go" \
+  -v "/buildkite/.tools/include:/usr/local/include" \
+  -v "/buildkite/.tools/bin/goreleaser:/usr/local/bin/goreleaser" \
+  -v "/buildkite/.tools/bin/grype:/usr/local/bin/grype" \
+  -v "/buildkite/.tools/bin/syft:/usr/local/bin/syft" \
   authelia/crossbuild \
   goreleaser release --clean --skip=publish,validate ${SNAPSHOT_FLAG}
diff --git a/.renovaterc b/.renovaterc
index 0172301..cfeaf3a 100644
--- a/.renovaterc
+++ b/.renovaterc
@@ -6,7 +6,7 @@
     ":separatePatchReleases",
     "helpers:pinGitHubActionDigests"
   ],
-  "branchPrefix": "renovate-",
+  "branchPrefixOld": "renovate-",
   "rebaseWhen": "conflicted",
   "ignorePresets": [
     ":prHourlyLimit2",