Upstream PRs 1735, 1745, 1741, 1749, 1748, 1727, 1756, 1750, 1719, 1734, 1759, 1758

.github/actions/run-in-docker-action/action.yml

@@ -4,37 +4,35 @@ inputs:
   dockerfile:
     description: 'A Dockerfile that defines an image'
     required: true
-  tag:
-    description: 'A tag of an image'
-    required: true
+  scope:
+    description: 'A cached image scope'
+    required: false
+    default: ${{ runner.arch }}
   command:
     description: 'A command to run in a container'
-    required: false
-    default: ./ci/ci.sh
+    required: true
 runs:
   using: "composite"
   steps:
     - uses: docker/setup-buildx-action@v3
 
-    - uses: docker/build-push-action@v5
+    - uses: docker/build-push-action@v6
       id: main_builder
       continue-on-error: true
       with:
         context: .
         file: ${{ inputs.dockerfile }}
-        tags: ${{ inputs.tag }}
         load: true
-        cache-from: type=gha
+        cache-from: type=gha,scope=${{ inputs.scope }}
 
-    - uses: docker/build-push-action@v5
+    - uses: docker/build-push-action@v6
       id: retry_builder
       if: steps.main_builder.outcome == 'failure'
       with:
         context: .
         file: ${{ inputs.dockerfile }}
-        tags: ${{ inputs.tag }}
         load: true
-        cache-from: type=gha
+        cache-from: type=gha,scope=${{ inputs.scope }}
 
     - # Workaround for https://github.com/google/sanitizers/issues/1614 .
       # The underlying issue has been fixed in clang 18.1.3.
@@ -47,7 +45,8 @@ runs:
           $(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "--env \(.) "') \
           --volume ${{ github.workspace }}:${{ github.workspace }} \
           --workdir ${{ github.workspace }} \
-          ${{ inputs.tag }} bash -c "
+          $(docker images -q | head -n1) \
+          bash -c "
             git config --global --add safe.directory ${{ github.workspace }}
             ${{ inputs.command }}
           "