Weekly cherry pick

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 [*.{h,cpp,rs,py,sh}]
 indent_size = 4
 
-# .cirrus.yml, etc.
+# ci.yml, etc.
 [*.yml]
 indent_size = 2
 

.github/actions/restore-caches/action.yml → .github/actions/cache/restore/action.yml

@@ -1,43 +1,51 @@
 name: 'Restore Caches'
 description: 'Restore ccache, depends sources, and built depends caches'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: true
 runs:
   using: 'composite'
   steps:
     - name: Restore Ccache cache
       id: ccache-cache
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
         restore-keys: |
           ccache-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore depends sources cache
       id: depends-sources
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
         restore-keys: |
           depends-sources-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore built depends cache
       id: depends-built
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
         restore-keys: |
           depends-built-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: Restore previous releases cache
       id: previous-releases
-      uses: actions/cache/restore@v5
+      uses: ./.github/actions/cache/restore/internal
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
         restore-keys: |
           previous-releases-${{ env.CONTAINER_NAME }}-
+        provider: ${{ inputs.provider }}
 
     - name: export cache hits
       shell: bash

.github/actions/cache/restore/internal/action.yml

@@ -0,0 +1,43 @@
+name: 'Cache Restore'
+description: 'Restore a cache with WarpBuild on Warp runners and GitHub Actions cache otherwise'
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to restore'
+    required: true
+  key:
+    description: 'An explicit key for restoring the cache'
+    required: true
+  restore-keys:
+    description: 'An ordered multiline string listing prefix-matched restore keys'
+    required: false
+    default: ''
+  provider:
+    description: 'The cache provider to use'
+    required: true
+outputs:
+  cache-hit:
+    description: 'A boolean value to indicate an exact match was found for the primary key'
+    value: ${{ steps.warp.outputs.cache-hit || steps.gha.outputs.cache-hit }}
+  cache-primary-key:
+    description: 'The primary key used to restore the cache'
+    value: ${{ steps.warp.outputs.cache-primary-key || steps.gha.outputs.cache-primary-key }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Restore cache with WarpBuild
+      id: warp
+      if: ${{ inputs.provider == 'warp' }}
+      uses: WarpBuilds/cache/restore@v1
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+        restore-keys: ${{ inputs.restore-keys }}
+
+    - name: Restore cache with GitHub Actions
+      id: gha
+      if: ${{ inputs.provider == 'gha' }}
+      uses: actions/cache/restore@v5
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+        restore-keys: ${{ inputs.restore-keys }}

.github/actions/save-caches/action.yml → .github/actions/cache/save/action.yml

@@ -1,5 +1,9 @@
 name: 'Save Caches'
 description: 'Save ccache, depends sources, and built depends caches'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: true
 runs:
   using: 'composite'
   steps:
@@ -11,29 +15,33 @@ runs:
         echo "previous releases direct cache hit to primary key: ${{ env.previous-releases-cache-hit }}"
 
     - name: Save Ccache cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) }}
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
+        provider: ${{ inputs.provider }}
 
     - name: Save depends sources cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-sources-cache-hit != 'true') }}
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
+        provider: ${{ inputs.provider }}
 
     - name: Save built depends cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-built-cache-hit != 'true' )}}
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
+        provider: ${{ inputs.provider }}
 
     - name: Save previous releases cache
-      uses: actions/cache/save@v5
+      uses: ./.github/actions/cache/save/internal
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.previous-releases-cache-hit != 'true' )}}
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
+        provider: ${{ inputs.provider }}

.github/actions/cache/save/internal/action.yml

@@ -0,0 +1,28 @@
+name: 'Cache Save'
+description: 'Save a cache with WarpBuild on Warp runners and GitHub Actions cache otherwise'
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to cache'
+    required: true
+  key:
+    description: 'An explicit key for saving the cache'
+    required: true
+  provider:
+    description: 'The cache provider to use'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Save cache with WarpBuild
+      if: ${{ inputs.provider == 'warp' }}
+      uses: WarpBuilds/cache/save@v1
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+
+    - name: Save cache with GitHub Actions
+      if: ${{ inputs.provider == 'gha' }}
+      uses: actions/cache/save@v5
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}

.github/actions/configure-docker/action.yml

@@ -1,9 +1,22 @@
 name: 'Configure Docker'
 description: 'Set up Docker build driver and configure build cache args'
+inputs:
+  provider:
+    description: 'The cache provider to use'
+    required: false
+    default: 'gha'
 runs:
   using: 'composite'
   steps:
+    - name: Set up Docker Buildx for Warp cache
+      if: ${{ inputs.provider == 'warp' }}
+      uses: docker/setup-buildx-action@v4
+      with:
+        driver-opts: |
+          network=host
+
     - name: Set up Docker Buildx
+      if: ${{ inputs.provider != 'warp' }}
       uses: docker/setup-buildx-action@v4
 
     # This is required when using the gha cache backend with a manual docker buildx invocation.
@@ -23,13 +36,18 @@ runs:
     - name: Construct docker build cache args
       shell: bash
       run: |
+        cache_options="scope=${CONTAINER_NAME}"
+        if [[ "${{ inputs.provider }}" == "warp" ]]; then
+          cache_options="url=http://127.0.0.1:49160/,version=1,${cache_options}"
+        fi
+
         # Configure docker build cache backend
         # Always optimistically --cache‑from in case a cache blob exists
-        args=(--cache-from "type=gha,scope=${CONTAINER_NAME}")
+        args=(--cache-from "type=gha,${cache_options}")
 
         # Only add --cache-to when pushing to the default branch.
         if [[ ${{ github.event_name }} == "push" && ${{ github.ref_name }} == ${{ github.event.repository.default_branch }} ]]; then
-          args+=(--cache-to "type=gha,mode=max,ignore-error=true,scope=${CONTAINER_NAME}")
+          args+=(--cache-to "type=gha,mode=max,ignore-error=true,${cache_options}")
         fi
 
         # Always `--load` into docker images (needed when using the `docker-container` build driver).