[GA] revert

.github/actions/build/action.yml

@@ -6,10 +6,17 @@ inputs:
     required: true
   cmake-args:
     default: null
+  cache-key:
+    required: true
 # An implicit input is the environment variable `build_dir`.
 runs:
   using: composite
   steps:
+    - name: dependencies
+      uses: ./.github/actions/dependencies
+      with:
+        configuration: ${{ inputs.configuration }}
+        cache-key: ${{ inputs.cache-key }}
     - name: configure
       shell: bash
       run: |

.github/actions/dependencies/action.yml

@@ -40,4 +40,4 @@ runs:
       uses: actions/cache/save@v4
       with:
         path: ~/.conan/data
-        key: ${{ inputs.cache-key }}-${{ inputs.configuration }}-conan-${{ hashFiles('conanfile.py') }}
+        key: ${{ steps.cache-restore.outputs.cache-primary-key }}

.github/workflows/build-in-docker.disabled.yml

@@ -1,105 +0,0 @@
-name: Build using Docker
-
-on:
-  push:
-    branches: ["dev", "candidate", "release", "jshooks"]
-  pull_request:
-    branches: ["dev", "candidate", "release", "jshooks"]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  DEBUG_BUILD_CONTAINERS_AFTER_CLEANUP: 1
-
-jobs:
-  checkout:
-    runs-on: [self-hosted, vanity]
-    outputs:
-      checkout_path: ${{ steps.vars.outputs.checkout_path }}
-    steps:
-      - name: Prepare checkout path
-        id: vars
-        run: |
-          SAFE_BRANCH=$(echo "${{ github.ref_name }}" | sed -e 's/[^a-zA-Z0-9._-]/-/g')
-          CHECKOUT_PATH="${SAFE_BRANCH}-${{ github.sha }}"
-          echo "checkout_path=${CHECKOUT_PATH}" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/checkout@v4
-        with:
-          path: ${{ steps.vars.outputs.checkout_path }}
-          clean: true
-          fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history
-
-  checkpatterns:
-    runs-on: [self-hosted, vanity]
-    needs: checkout
-    defaults:
-      run:
-        working-directory: ${{ needs.checkout.outputs.checkout_path }}
-    steps:
-      - name: Check for suspicious patterns
-        run: /bin/bash suspicious_patterns.sh
-
-  build:
-    runs-on: [self-hosted, vanity]
-    needs: [checkpatterns, checkout]
-    defaults:
-      run:
-        working-directory: ${{ needs.checkout.outputs.checkout_path }}
-    steps:
-      - name: Set Cleanup Script Path
-        run: |
-          echo "JOB_CLEANUP_SCRIPT=$(mktemp)" >> $GITHUB_ENV
-
-      - name: Build using Docker
-        run: /bin/bash release-builder.sh
-
-      - name: Stop Container (Cleanup)
-        if: always()
-        run: |
-          echo "Running cleanup script: $JOB_CLEANUP_SCRIPT"
-          /bin/bash -e -x "$JOB_CLEANUP_SCRIPT"
-          CLEANUP_EXIT_CODE=$?
-
-          if [[ "$CLEANUP_EXIT_CODE" -eq 0 ]]; then
-            echo "Cleanup script succeeded."
-            rm -f "$JOB_CLEANUP_SCRIPT"
-            echo "Cleanup script removed."
-          else
-            echo "⚠️ Cleanup script failed! Keeping for debugging: $JOB_CLEANUP_SCRIPT"
-          fi
-
-          if [[ "${DEBUG_BUILD_CONTAINERS_AFTER_CLEANUP}" == "1" ]]; then
-            echo "🔍 Checking for leftover containers..."
-            BUILD_CONTAINERS=$(docker ps --format '{{.Names}}' | grep '^xahaud_cached_builder' || echo "")
-
-            if [[ -n "$BUILD_CONTAINERS" ]]; then
-              echo "⚠️ WARNING: Some build containers are still running"
-              echo "$BUILD_CONTAINERS"
-            else
-              echo "✅ No build containers found"
-            fi
-          fi
-
-  tests:
-    runs-on: [self-hosted, vanity]
-    needs: [build, checkout]
-    defaults:
-      run:
-        working-directory: ${{ needs.checkout.outputs.checkout_path }}
-    steps:
-      - name: Unit tests
-        run: /bin/bash docker-unit-tests.sh
-
-  cleanup:
-    runs-on: [self-hosted, vanity]
-    needs: [tests, checkout]
-    if: always()
-    steps:
-      - name: Cleanup workspace
-        run: |
-          CHECKOUT_PATH="${{ needs.checkout.outputs.checkout_path }}"
-          echo "Cleaning workspace for ${CHECKOUT_PATH}"
-          rm -rf "${{ github.workspace }}/${CHECKOUT_PATH}"

.github/workflows/macos.ga.yml

@@ -92,15 +92,15 @@ jobs:
           SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
           echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
       
-      # - name: Restore build directory cache
-      #   id: build-cache-restore
-      #   uses: actions/cache/restore@v4
-      #   with:
-      #     path: ${{ env.build_dir }}
-      #     key: ${{ runner.os }}-build-${{ matrix.configuration }}-${{ steps.safe-branch.outputs.name }}-${{ hashFiles('**/conanfile.txt', '**/conanfile.py') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ matrix.configuration }}-${{ steps.safe-branch.outputs.name }}-
-      #       ${{ runner.os }}-build-${{ matrix.configuration }}-
+      - name: Restore build directory cache
+        id: build-cache-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ env.build_dir }}
+          key: macos-build-${{ matrix.configuration }}-${{ steps.safe-branch.outputs.name }}-${{ hashFiles('conanfile.py') }}
+          restore-keys: |
+            macos-build-${{ matrix.configuration }}-${{ steps.safe-branch.outputs.name }}-
+            macos-build-${{ matrix.configuration }}-
       
       - name: Build
         uses: ./.github/actions/build
@@ -108,12 +108,12 @@ jobs:
           generator: ${{ matrix.generator }}
           configuration: ${{ matrix.configuration }}
 
-      # - name: Save build directory cache
-      #   if: success()
-      #   uses: actions/cache/save@v4
-      #   with:
-      #     path: ${{ env.build_dir }}
-      #     key: ${{ steps.build-cache-restore.outputs.cache-primary-key }}
+      - name: Save build directory cache
+        if: success()
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ env.build_dir }}
+          key: ${{ steps.build-cache-restore.outputs.cache-primary-key }}
 
       - name: Test
         run: |