From 0e35ca7dad049358ccefef5fc23f5e7a1c9566fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Wed, 11 Jun 2025 15:14:43 +0200
Subject: [PATCH] ci(diff-on-branch): Update to ensure opendesk-env files are
 loaded

---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9ae7b60..2ac88fa7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -681,9 +681,11 @@ diff-on-branch:
   cache: {}
   dependencies: []
   extends: ".environments"
-  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:${HELM_IMAGE_PIN}"
+  variables:
+    DIFF_ON_BRANCH_SUBDIRECTORY: "diff-on-branch"
   environment:
     name: "${NAMESPACE}"
+  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:${HELM_IMAGE_PIN}"
   rules:
     - if: "$DIFF_ON_BRANCH"
   script:
@@ -693,8 +695,8 @@ diff-on-branch:
       BASE_URL="https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/archive"
       FILE_NAME="opendesk-${SAFE_BRANCH_NAME}.tar.gz"
       curl -L "${BASE_URL}/${DIFF_ON_BRANCH}/${FILE_NAME}" -o branch.tar.gz
-      mkdir branch && tar -xzf branch.tar.gz -C branch --strip-components=1
-      cd branch
+      mkdir ${DIFF_ON_BRANCH_SUBDIRECTORY} && tar -xzf branch.tar.gz -C ${DIFF_ON_BRANCH_SUBDIRECTORY} --strip-components=1
+      cd ${DIFF_ON_BRANCH_SUBDIRECTORY}
       helmfile --namespace ${NAMESPACE} diff | grep -v '^ ' || true
   tags:
     - "docker"