Fixes develop

.github/actions/migrate-compiler-cache/action.yml

@@ -0,0 +1,26 @@
+name: Import a previous compiler cache
+description: Stage one compatible per-job compiler snapshot for a cold family cache.
+inputs:
+  legacy-prefix:
+    description: Previous per-job cache prefix without its branch-layer suffix.
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Describe previous compiler cache
+      id: migration
+      shell: bash
+      env:
+        LEGACY_CACHE_PREFIX: ${{ inputs.legacy-prefix }}
+      run: python .github/ci/compiler_cache.py migration-plan --prefix "$LEGACY_CACHE_PREFIX"
+    - name: Restore previous compiler cache
+      id: legacy
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ${{ steps.migration.outputs.path }}
+        key: ${{ steps.migration.outputs.key }}
+        restore-keys: ${{ steps.migration.outputs.prefix }}
+    - name: Stage previous compiler cache
+      if: steps.legacy.outputs.cache-matched-key != ''
+      shell: bash
+      run: python .github/ci/compiler_cache.py import

.github/actions/prepare-dependencies/action.yml

@@ -4,9 +4,33 @@ inputs:
   profile:
     description: CI composition, headless or modules.
     required: true
+  cache-job:
+    description: Unique matrix job name for Windows dependency contributions.
+    default: worker
+  windows-vcpkg:
+    description: Build shared Windows dependencies once, or consume a prepared installation.
+    default: build
+  prepared-artifact:
+    description: Installed vcpkg artifact from this run's platform preparation job.
+    default: ''
+outputs:
+  dependency-cache-writer:
+    description: Whether this run may publish its main or develop build dependency cache.
+    value: ${{ steps.metadata.outputs.dependency-cache-writer }}
 runs:
   using: composite
   steps:
+    - name: Validate dependency preparation mode
+      shell: bash
+      env:
+        VCPKG_MODE: ${{ inputs.windows-vcpkg }}
+        PREPARED_ARTIFACT: ${{ inputs.prepared-artifact }}
+      run: |
+        case "$VCPKG_MODE" in
+          build) ;;
+          consume) test -n "$PREPARED_ARTIFACT" ;;
+          *) echo 'Unknown Windows vcpkg preparation mode' >&2; exit 1 ;;
+        esac
     - name: Describe dependency caches
       id: metadata
       shell: bash
@@ -19,13 +43,16 @@ runs:
       with:
         path: ${{ steps.metadata.outputs.submodule-path }}
         key: ${{ steps.metadata.outputs.submodule-key }}
+        restore-keys: |
+          ${{ steps.metadata.outputs.submodule-prefix }}
+          ${{ steps.metadata.outputs.submodule-main-prefix }}
     - name: Check out pinned submodules
       shell: bash
       env:
         CHERYL_SUBMODULE_TOKEN: ${{ github.token }}
       run: python .github/ci/dependencies.py submodules
     - name: Save submodule Git objects
-      if: steps.submodules.outputs.cache-hit != 'true'
+      if: steps.metadata.outputs.dependency-cache-writer == 'true' && steps.submodules.outputs.cache-hit != 'true'
       uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.metadata.outputs.submodule-path }}
@@ -39,26 +66,12 @@ runs:
           ${{ steps.metadata.outputs.vcpkg-root }}
           ${{ steps.metadata.outputs.ccache-tools }}
         key: ${{ steps.metadata.outputs.tools-key }}
-    - name: Restore Windows dependency packages and downloads
-      if: runner.os == 'Windows'
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: ${{ steps.metadata.outputs.dependency-path }}
-        key: ${{ steps.metadata.outputs.dependency-key }}
-        restore-keys: |
-          ${{ steps.metadata.outputs.dependency-exact-prefix }}
-          ${{ steps.metadata.outputs.dependency-profile-prefix }}
-          ${{ steps.metadata.outputs.dependency-runner-prefix }}
-    - name: Snapshot Windows dependency cache
-      if: runner.os == 'Windows'
-      shell: bash
-      run: python .github/ci/dependencies.py cache-state --snapshot
     - name: Prepare pinned Windows tools
       if: runner.os == 'Windows'
       shell: bash
       run: python .github/ci/dependencies.py windows-tools
     - name: Save Windows tools
-      if: runner.os == 'Windows' && steps.tools.outputs.cache-hit != 'true'
+      if: runner.os == 'Windows' && steps.metadata.outputs.environment-cache-writer == 'true' && steps.tools.outputs.cache-hit != 'true'
       uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: |
@@ -72,9 +85,6 @@ runs:
       with:
         path: ${{ steps.metadata.outputs.pip-path }}
         key: ${{ steps.metadata.outputs.pip-key }}
-        restore-keys: |
-          ${{ steps.metadata.outputs.pip-exact-prefix }}
-          ${{ steps.metadata.outputs.pip-prefix }}
     - name: Snapshot Python cache
       if: runner.os == 'Windows' && inputs.profile == 'modules'
       shell: bash
@@ -89,11 +99,63 @@ runs:
       shell: bash
       run: python .github/ci/dependencies.py cache-state --cache pip
     - name: Save Python downloads and wheels
-      if: runner.os == 'Windows' && inputs.profile == 'modules' && steps.pip-state.outputs.changed == 'true'
+      if: runner.os == 'Windows' && inputs.profile == 'modules' && steps.metadata.outputs.environment-cache-writer == 'true' && steps.pip.outputs.cache-hit != 'true' && steps.pip-state.outputs.changed == 'true'
       uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.metadata.outputs.pip-path }}
         key: ${{ steps.pip.outputs.cache-primary-key }}
+    - name: Describe shared Windows dependency pool
+      if: runner.os == 'Windows' && inputs.windows-vcpkg == 'build'
+      id: vcpkg
+      shell: bash
+      run: python .github/ci/vcpkg_cache.py describe
+    - name: Restore shared Windows dependency pool
+      if: runner.os == 'Windows' && inputs.windows-vcpkg == 'build'
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ${{ steps.vcpkg.outputs.cache-path }}
+        key: ${{ steps.vcpkg.outputs.cache-key }}
+        restore-keys: ${{ steps.vcpkg.outputs.cache-prefix }}
+    - name: Install Windows dependencies
+      if: runner.os == 'Windows' && inputs.windows-vcpkg == 'build'
+      id: vcpkg-install
+      shell: pwsh
+      env:
+        DEPENDENCY_PROFILE: ${{ inputs.profile }}
+      run: |
+        $vswhere = "${env:ProgramFiles(x86)}/Microsoft Visual Studio/Installer/vswhere.exe"
+        $vs = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
+        if (!$vs) { throw 'MSVC x64 tools are unavailable' }
+        & "$vs/Common7/Tools/Launch-VsDevShell.ps1" -Arch amd64 -HostArch amd64 -SkipAutomaticLocation
+        python .github/ci/dependencies.py windows-install --profile $env:DEPENDENCY_PROFILE
+        if ($LASTEXITCODE) { exit $LASTEXITCODE }
+    - name: Pack prepared Windows dependencies
+      if: ${{ !cancelled() && runner.os == 'Windows' && inputs.windows-vcpkg == 'build' && steps.vcpkg-install.outcome == 'success' }}
+      id: vcpkg-pack
+      shell: bash
+      run: python .github/ci/vcpkg_cache.py pack --installed "$CHERYL_CI_VCPKG_INSTALLED_DIR"
+    - name: Retain prepared Windows dependencies
+      if: ${{ !cancelled() && runner.os == 'Windows' && inputs.windows-vcpkg == 'build' && steps.vcpkg-pack.outputs.has-content == 'true' }}
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+      with:
+        name: vcpkg-cache-${{ runner.arch }}-${{ inputs.cache-job }}-${{ github.run_attempt }}
+        path: ${{ steps.vcpkg.outputs.contribution-path }}
+        if-no-files-found: error
+        compression-level: 0
+        overwrite: true
+        retention-days: 1
+    - name: Download shared Windows installation
+      if: runner.os == 'Windows' && inputs.windows-vcpkg == 'consume'
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+      with:
+        name: ${{ inputs.prepared-artifact }}
+        path: ${{ steps.metadata.outputs.vcpkg-installed-dir }}
+    - name: Verify shared Windows installation
+      if: runner.os == 'Windows' && inputs.windows-vcpkg == 'consume'
+      shell: bash
+      env:
+        DEPENDENCY_PROFILE: ${{ inputs.profile }}
+      run: python .github/ci/dependencies.py windows-verify --profile "$DEPENDENCY_PROFILE"
     - name: Update Linux package indexes
       if: runner.os == 'Linux'
       shell: bash
@@ -119,7 +181,7 @@ runs:
         DEPENDENCY_PROFILE: ${{ inputs.profile }}
       run: python .github/ci/dependencies.py apt-install --profile "$DEPENDENCY_PROFILE"
     - name: Save Linux package binaries
-      if: runner.os == 'Linux' && steps.apt-plan.outputs.needed == 'true' && steps.apt.outputs.cache-hit != 'true'
+      if: runner.os == 'Linux' && steps.metadata.outputs.environment-cache-writer == 'true' && steps.apt-plan.outputs.needed == 'true' && steps.apt.outputs.cache-hit != 'true'
       uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.metadata.outputs.dependency-path }}/apt/*.deb

.github/actions/restore-compiler-cache/action.yml

@@ -0,0 +1,56 @@
+name: Restore layered compiler caches
+description: Restore immutable compiler layers and optionally attach a fresh writable delta.
+inputs:
+  prefix:
+    description: Compiler cache format, runner, architecture and compiler family prefix.
+    required: true
+  attach:
+    description: Configure ccache for a worker; publishers only restore the layers.
+    default: 'true'
+outputs:
+  current-path:
+    description: Current immutable layer, or the publisher's merged layer to save.
+    value: ${{ steps.metadata.outputs.current-path }}
+  current-key:
+    description: New immutable key for this run's family snapshot.
+    value: ${{ steps.metadata.outputs.current-key }}
+  delta-archive:
+    description: Worker archive path for this run's compiler additions.
+    value: ${{ steps.metadata.outputs.delta-archive }}
+  current-hit:
+    description: Whether the current family layer was restored.
+    value: ${{ steps.current.outputs.cache-matched-key != '' }}
+runs:
+  using: composite
+  steps:
+    - name: Describe compiler cache layers
+      id: metadata
+      shell: bash
+      env:
+        CACHE_PREFIX: ${{ inputs.prefix }}
+      run: python .github/ci/compiler_cache.py plan --prefix "$CACHE_PREFIX"
+    - name: Restore main compiler baseline
+      if: steps.metadata.outputs.restore-main == 'true'
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ${{ steps.metadata.outputs.main-path }}
+        key: ${{ steps.metadata.outputs.main-prefix }}${{ github.run_id }}-${{ github.run_attempt }}
+        restore-keys: ${{ steps.metadata.outputs.main-prefix }}
+    - name: Restore develop compiler additions
+      if: steps.metadata.outputs.restore-develop == 'true'
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ${{ steps.metadata.outputs.develop-path }}
+        key: ${{ steps.metadata.outputs.develop-prefix }}${{ github.run_id }}-${{ github.run_attempt }}
+        restore-keys: ${{ steps.metadata.outputs.develop-prefix }}
+    - name: Restore current compiler additions
+      id: current
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      with:
+        path: ${{ steps.metadata.outputs.current-path }}
+        key: ${{ steps.metadata.outputs.current-key }}
+        restore-keys: ${{ steps.metadata.outputs.current-prefix }}
+    - name: Configure compiler cache layers
+      if: inputs.attach == 'true'
+      shell: bash
+      run: python .github/ci/compiler_cache.py attach