Skip to content

Commit

Permalink
Merge pull request #112 from crazy-max/ci-fix-macos
Browse files Browse the repository at this point in the history
ci: enforce QEMU version on macOS
  • Loading branch information
crazy-max authored Oct 4, 2024
2 parents da44386 + 8f83260 commit 4acbcb8
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ./
Expand All @@ -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: ./
Expand Down Expand Up @@ -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: ./
Expand All @@ -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: ./
Expand Down Expand Up @@ -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: ./
Expand Down
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4acbcb8

Please sign in to comment.