From 890e10afc7fa81cb3b313007768b6f3bc6810cf5 Mon Sep 17 00:00:00 2001
From: Schnitz <12687466+CptSchnitz@users.noreply.github.com>
Date: Thu, 23 Jul 2026 10:05:35 +0300
Subject: [PATCH] ci(global): small fixes for build and push and release

---
 .github/workflows/build-and-push.yaml | 6 ++++--
 helm/Chart.yaml                       | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index b69eff3..bc99b42 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -3,7 +3,7 @@ name: Build and Push Service Images
 on:
   push:
     tags:
-      - 'v*'
+      - 'root*'
   workflow_dispatch:
 
 jobs:
@@ -70,7 +70,7 @@ jobs:
           cache-dir: cache-mount
           dockerfile: ${{ matrix.dockerfile }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           tags: ${{ secrets.ACR_URL }}/infra/${{ matrix.service }}:${{ matrix.version }}
@@ -78,6 +78,8 @@ jobs:
           cache-to: type=gha,mode=max
           file: ${{ matrix.dockerfile }}
           push: true
+          build-args: |
+            APP_NAME=${{ matrix.service }}
 
   build-and-push-helm:
     needs: setup
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 2152e33..8e2a6d6 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -7,15 +7,15 @@ dependencies:
   - name: opa
     repository: file://charts/opa
     condition: opa.enabled
-    version: 1.12.0
+    version: 2.0.0 # x-release-please-version
   - name: auth-cron
     repository: file://../apps/auth-cron/helm
     condition: auth-cron.enabled
-    version: 1.12.0
+    version: 2.0.0 # x-release-please-version
   - name: auth-manager
     repository: file://../apps/auth-manager/helm
     condition: auth-manager.enabled
-    version: 1.12.0
+    version: 2.0.0 # x-release-please-version
   - name: nginx
     repository: oci://acrarolibotnonprod.azurecr.io/helm/common
     condition: auth-ui.enabled
@@ -24,7 +24,7 @@ dependencies:
   - name: token-kiosk
     repository: file://../apps/token-kiosk/helm
     condition: token-kiosk.enabled
-    version: 1.12.0
+    version: 2.0.0 # x-release-please-version
   - name: nginx
     repository: oci://acrarolibotnonprod.azurecr.io/helm/common
     condition: kiosk-ui.enabled