Merge upstream master to resolve conflicts

Made-with: Cursor

README.md

@@ -13,6 +13,7 @@ GitHub Action to install [QEMU](https://github.com/qemu/qemu) static binaries.
 ___
 
 * [Usage](#usage)
+  * [Multi-platform build example](#multi-platform-build-example)
 * [Customizing](#customizing)
   * [inputs](#inputs)
   * [outputs](#outputs)
@@ -32,7 +33,7 @@ jobs:
     steps:
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 ```
 
 > [!NOTE]
@@ -42,12 +43,11 @@ jobs:
 > ```yaml
 >     -
 >       name: Set up QEMU
->       uses: docker/setup-qemu-action@v3
+>       uses: docker/setup-qemu-action@v4
 >     -
--
-  name: Set up Docker Buildx
-  uses: docker/setup-buildx-action@v3
-```
+>       name: Set up Docker Buildx
+>       uses: docker/setup-buildx-action@v4
+> ```
 
 ### Multi-platform build example
 
@@ -57,33 +57,33 @@ The following example shows how to use this action to build and push a multi-pla
 name: ci
 
 on:
-push:
-branches:
-- 'main'
+  push:
+    branches:
+      - 'main'
 
 jobs:
-docker:
-runs-on: ubuntu-latest
-steps:
--
-  name: Set up QEMU
-  uses: docker/setup-qemu-action@v3
--
-  name: Set up Docker Buildx
-  uses: docker/setup-buildx-action@v3
--
-  name: Login to Docker Hub
-  uses: docker/login-action@v3
-  with:
-    username: ${{ secrets.DOCKERHUB_USERNAME }}
-    password: ${{ secrets.DOCKERHUB_TOKEN }}
--
-  name: Build and push
-  uses: docker/build-push-action@v6
-  with:
-    push: true
-    tags: user/app:latest
-    platforms: linux/amd64,linux/arm64
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: user/app:latest
+          platforms: linux/amd64,linux/arm64
 ```
 
 ## Customizing