From 05ccccded8145e3912d76b6048d4a31a7e421bed Mon Sep 17 00:00:00 2001
From: = <47920326+mahee96@users.noreply.github.com>
Date: Wed, 26 Feb 2025 20:00:05 +0530
Subject: [PATCH] - CI: serialization bug fix - reverted concurrency lock to
 workflow level instead of job level which was causing issues due to incorrect
 cache at expected jobs

---
 .github/workflows/reusable-build-workflow.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/reusable-build-workflow.yml b/.github/workflows/reusable-build-workflow.yml
index cbf259dc..89415227 100644
--- a/.github/workflows/reusable-build-workflow.yml
+++ b/.github/workflows/reusable-build-workflow.yml
@@ -46,11 +46,16 @@ on:
 
 jobs:
   common:
-    name: Shared Steps
+    name: Wait for other jobs
+    # since build cache, test-build cache, test-run cache are involved, out of order exec if serialization is on individual jobs will wreak all sorts of havoc
+    # so we serialize on the entire workflow
+    concurrency:                  
+      group: serialize-workflow
     strategy:
       fail-fast: false
     runs-on: 'macos-15'
     steps:
+    - run: echo "No other contending jobs are running now..."
     - name: Set short commit hash
       id: commit-id
       run: |
@@ -64,8 +69,6 @@ jobs:
   build:
     name: Build SideStore - ${{ inputs.release_tag }}
     needs: common
-    concurrency:
-      group: build-number-increment   # serialize for build num cache access
     strategy:
       fail-fast: false
       matrix:
@@ -80,8 +83,6 @@ jobs:
       release-channel: ${{ steps.release-channel.outputs.RELEASE_CHANNEL }}
 
     steps:
-      - run: echo "No other contending jobs are running now...Build is ready to start"
-
       - name: Set beta status
         run: echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV