From 2f65a84bf08ab01600ab2ed3f86d46ad719aa34e Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 16 Dec 2024 23:58:11 +0000 Subject: [PATCH] Use macOS+arm64 for maximal reproduction check :D. --- .github/actions/lima-docker/action.yml | 2 +- .github/actions/nerdctl/action.yml | 4 +--- .github/workflows/main.yml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/actions/lima-docker/action.yml b/.github/actions/lima-docker/action.yml index 979aaea80..127302eab 100644 --- 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 index 90dc3a2f6..5bdd27c39 100644 --- 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 index f4c09511f..f54ba4a6b 100644 --- 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: