Updated build process for Zabbix agent (windows)

zabbix · May 21, 2024 · 6d2dcfc · 6d2dcfc
1 parent 5e6d139
commit 6d2dcfc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/base_images_build_windows.yml b/.github/workflows/base_images_build_windows.yml
@@ -12,6 +12,7 @@ on:
   schedule:
     - cron:  '0 10 * * 2,5'
   workflow_dispatch:
+  workflow_call:
 
 defaults:
   run:
@@ -323,5 +324,5 @@ jobs:
       - name: Cache image digest
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
-          path: ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.current_branch }}
-          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}
+          path: ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}
+          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}-${{ needs.init_build.outputs.current_branch }}
diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
@@ -140,6 +140,13 @@ jobs:
             echo "current_branch=$github_ref" >> $GITHUB_OUTPUT
             echo "sha_short=$sha_short" >> $GITHUB_OUTPUT
 
+  build_base:
+    uses: ./.github/workflows/base_images_build_windows.yml
+    if: ${{ github.event_name == 'release' }}
+    permissions:
+      contents: read
+      id-token: write
+
   build_components:
     name: Build ${{ matrix.component }} sources on ${{ matrix.os }}
     needs: [ "init_build" ]
@@ -208,10 +215,8 @@ jobs:
       - name: Download SHA256 tag of ${{ env.BASE_IMAGE_NAME }}:${{ matrix.os }}
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
-          path: |
-              ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.sha_short }}
-              ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.current_branch }}
-          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}
+          path: ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}
+          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}-${{ needs.init_build.outputs.current_branch }}
           fail-on-cache-miss: true
 
       - name: Retrieve ${{ env.BASE_IMAGE_NAME }}:${{ matrix.os }} SHA256 tag