From 4f5bb9fcef4fe33230767a5bf38ccf8ebb428d72 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:52:34 +0200
Subject: [PATCH 1/2] ci: enforce QEMU version on macOS

---
 .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31aea70..a1f8d18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,6 +37,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        if: startsWith(matrix.os, 'macos')
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set version
         shell: bash
@@ -68,6 +73,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        if: startsWith(matrix.os, 'macos')
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -93,6 +103,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        if: startsWith(matrix.os, 'macos')
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -123,6 +138,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        if: startsWith(matrix.os, 'macos')
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -145,6 +165,10 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -213,6 +237,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Set up QEMU
+        if: startsWith(matrix.os, 'macos')
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./

From 8f832606d8243b3efa938dfc2cc0ed6c068da72f Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:03:51 +0200
Subject: [PATCH 2/2] docs: add extra step for QEMU issue

---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index 273ba37..b981f23 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,29 @@ jobs:
         uses: crazy-max/ghaction-setup-docker@v3
 ```
 
+> [!IMPORTANT]
+> macOS runners hang with latest QEMU 9.1.0. You need to install QEMU 9.0.2 as
+> a workaround:
+> ```yaml
+> name: ci
+> 
+> on:
+>   push:
+> 
+> jobs:
+>   docker:
+>     runs-on: macos-13
+>     steps:
+>       -
+>         # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+>         name: Install QEMU 9.0.2
+>         uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
+>       -
+>         name: Set up Docker
+>         uses: crazy-max/ghaction-setup-docker@v3
+> ```
+> More info: https://github.com/crazy-max/ghaction-setup-docker/issues/108.
+
 ### Daemon configuration
 
 You can [configure the Docker daemon](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file)