From cb7c62f649c79fc447b885a056bfd5580ea6282c Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 May 2024 11:09:18 +0000 Subject: [PATCH] GitHub now maps macos-latest to arm64 machines :(. --- .github/actions/nerdctl/action.yml | 2 ++ .github/workflows/main.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/nerdctl/action.yml b/.github/actions/nerdctl/action.yml index 127b5713c..90dc3a2f6 100644 --- a/.github/actions/nerdctl/action.yml +++ b/.github/actions/nerdctl/action.yml @@ -3,6 +3,8 @@ 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 shell: bash - run: echo "ENV_DOCKER=nerdctl.lima" >>"${GITHUB_ENV}" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 94e1a987f..8823f5c91 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -128,7 +128,7 @@ jobs: build-mac-srv: needs: [cache-submodule] - runs-on: macos-latest + runs-on: macos-13 if: ${{ false }} # XXX: Hypervisor.framework steps: @@ -209,7 +209,7 @@ jobs: build-win-srv: needs: [cache-submodule] - runs-on: macos-latest + runs-on: macos-13 if: ${{ false }} # XXX: use Hyper-V steps: @@ -345,7 +345,7 @@ jobs: build-lnx-mac: needs: [cache-submodule] - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v4