From a37f5d9d0b2c6483c8f66b811abee3aaeca423ef Mon Sep 17 00:00:00 2001
From: roicohen <213414225+roicohen326@users.noreply.github.com>
Date: Mon, 16 Feb 2026 13:58:25 +0200
Subject: [PATCH 1/2] fix: add token to build workflow for private actions
 access

---
 .github/workflows/build-and-push.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index b70e1a9..fd0e42d 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -14,6 +14,8 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_PAT }}
 
       - name: Login to ACR
         uses: MapColonies/artifactory-login@v1.0.0
@@ -36,3 +38,4 @@ jobs:
           domain: raster
           project: ${{ github.repository }}
           tag: ${{ github.ref_name }}
+          github_token: ${{ secrets.GH_PAT }}

From e265c5926fb87067a59bc6505059507a78409bf0 Mon Sep 17 00:00:00 2001
From: roicohen <213414225+roicohen326@users.noreply.github.com>
Date: Mon, 16 Feb 2026 16:16:19 +0200
Subject: [PATCH 2/2] fix: update build-and-push workflow to use
 shared-workflows actions

---
 .github/workflows/build-and-push.yaml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index fd0e42d..0ac03cc 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -17,25 +17,26 @@ jobs:
         with:
           token: ${{ secrets.GH_PAT }}
 
-      - name: Login to ACR
-        uses: MapColonies/artifactory-login@v1.0.0
+      - name: Artifactory Login
+        uses: MapColonies/shared-workflows/actions/artifactory-login@artifactory-login-v1.0.0
         with:
+          registry: ${{ secrets.ACR_URL }}
           username: ${{ secrets.ACR_PUSH_USER }}
           password: ${{ secrets.ACR_PUSH_TOKEN }}
-          registry: acrarolibotnonprod.azurecr.io
 
       - name: Build and Push Helm Chart
-        uses: MapColonies/build-and-push-helm@v1.0.1
+        uses: MapColonies/shared-workflows/actions/build-and-push-helm@build-and-push-helm-v1.0.1
         with:
+          context: ./helm
           domain: raster
-          project: ${{ github.repository }}
-          tag: ${{ github.ref_name }}
-          registry_url: acrarolibotnonprod.azurecr.io
+          registry: ${{ secrets.ACR_URL }}
 
-      - name: Update Artifacts File
-        uses: MapColonies/update-artifacts-file@v1.1.1
+      - name: Update Artifacts File- Helm
+        uses: MapColonies/shared-workflows/actions/update-artifacts-file@update-artifacts-file-v1.1.1
         with:
           domain: raster
-          project: ${{ github.repository }}
-          tag: ${{ github.ref_name }}
+          artifact_name: ${{ github.event.repository.name }}
+          artifact_tag: ${{ github.ref_name }}
+          type: helm
+          registry: ${{ secrets.ACR_URL }}
           github_token: ${{ secrets.GH_PAT }}