From 860eb5ae2b4701226cb098632205d94d6cb41c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Mon, 17 Jun 2024 16:26:29 -0700 Subject: [PATCH] Fix linux-ia32, linux-arm-musl, and windows-arm64 releases (#2265) --- .github/workflows/build-linux-musl.yml | 4 ++-- .github/workflows/build-linux.yml | 2 +- .github/workflows/build-windows.yml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-linux-musl.yml b/.github/workflows/build-linux-musl.yml index aa33b4eff..27bc592a7 100644 --- a/.github/workflows/build-linux-musl.yml +++ b/.github/workflows/build-linux-musl.yml @@ -19,7 +19,7 @@ jobs: platform: linux/amd64 - arch: ia32 runner: ubuntu-latest - platform: linux/386 + platform: linux/amd64 - arch: arm64 runner: linux-arm64 platform: linux/arm64 @@ -51,7 +51,7 @@ jobs: - name: Build run: | docker run --rm -i \ - --platform ${{ matrix.arch == 'arm' && 'linux/amd64' || matrix.platform }} \ + --platform ${{ matrix.platform }} \ --volume "$PWD:$PWD" \ --workdir "$PWD" \ ghcr.io/dart-musl/dart <<'EOF' diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index bf28d809f..4f0d3450c 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -19,7 +19,7 @@ jobs: platform: linux/amd64 - arch: ia32 runner: ubuntu-latest - platform: linux/386 + platform: linux/amd64 - arch: arm64 runner: linux-arm64 platform: linux/arm64 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 86ea17c22..b2011ce2f 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -19,7 +19,8 @@ jobs: - arch: ia32 runner: windows-latest - arch: arm64 - runner: windows-arm64 + # TODO: switch the following to windows-arm64, blocked by https://github.com/dart-lang/setup-dart/issues/118 + runner: windows-latest # windows-arm64 steps: - uses: actions/checkout@v4