Use macOS+arm64 for maximal reproduction check :D.

OrchidTechnologies · Dec 16, 2024 · 2f65a84 · 2f65a84
1 parent 5c20b13
commit 2f65a84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/actions/lima-docker/action.yml b/.github/actions/lima-docker/action.yml
@@ -3,7 +3,7 @@ runs:
   steps:
     - run: brew install docker lima
       shell: bash
-    - run: limactl start template://docker
+    - run: limactl start template://docker --arch=x86_64
       shell: bash
     - run: docker context create lima-docker --docker "host=unix://${HOME}/.lima/docker/sock/docker.sock"
       shell: bash

diff --git a/.github/actions/nerdctl/action.yml b/.github/actions/nerdctl/action.yml
@@ -3,9 +3,7 @@ runs:
   steps:
     - run: brew install lima
       shell: bash
-    # XXX: this requires nested virtualization, so no arm?
-    # https://github.com/actions/runner-images/issues/9460
-    - run: limactl start default
+    - run: limactl start default --arch=x86_64
       shell: bash
     - run: echo "ENV_DOCKER=nerdctl.lima" >>"${GITHUB_ENV}"
       shell: bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -353,7 +353,7 @@ jobs:
 
   build-lnx-mac:
     needs: [cache-submodule]
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v4
@@ -363,7 +363,7 @@ jobs:
     - uses: ./.github/actions/nerdctl
     - run: env/setup-ndk.sh
 
-    - run: gmake -j3 -C srv-daemon target=lnx
+    - run: gmake -j3 -C srv-daemon target=lnx machine=x86_64
 
     - uses: actions/upload-artifact@v4
       with: