From 1214579619cdf947563dac9df60a76a430d4c961 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 8 Feb 2024 20:15:58 +0900
Subject: [PATCH] Prepare universal workflow

---
 .github/workflows/images_build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index a3bf3d5fc..0eba0b640 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -238,8 +238,8 @@ jobs:
           labels: |
             org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
             org.opencontainers.image.created=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-          cache-from: type=gha,scope=zabbix-${{ env.BASE_BUILD_NAME }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
-          cache-to: type=gha,mode=max,scope=zabbix-${{ env.BASE_BUILD_NAME }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
+          cache-from: type=gha,scope=zabbix-${{ env.BASE_BUILD_NAME }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
+          cache-to: type=gha,mode=max,scope=zabbix-${{ env.BASE_BUILD_NAME }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
 
       - name: Sign the images with GitHub OIDC Token
         env:
@@ -385,8 +385,8 @@ jobs:
           labels: |
             org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
             org.opencontainers.image.created=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-          cache-from: type=gha,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
-          cache-to: type=gha,mode=max,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
+          cache-from: type=gha,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
+          cache-to: type=gha,mode=max,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
 
       - name: Sign the images with GitHub OIDC Token
         env:
@@ -526,8 +526,8 @@ jobs:
           labels: |
             org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
             org.opencontainers.image.created=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-          cache-from: type=gha,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
-          cache-to: type=gha,mode=max,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.tags[0] }}
+          cache-from: type=gha,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
+          cache-to: type=gha,mode=max,scope=zabbix-${{ matrix.build }}-${{ matrix.os }}-${{ steps.meta.outputs.json.tags[0] }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}