From 3627e44f59dbc9bc99e9547007e4c7c9832a2b5c Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 17 Apr 2025 19:51:11 +0100 Subject: [PATCH] Add Windows 11 arm support to ci Try installing cargo Windows arm Update action.yml --- .github/actions/install-deps/action.yml | 6 +++++- .github/workflows/main.yml | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml index 8b81d56..a2ca89f 100644 --- a/.github/actions/install-deps/action.yml +++ b/.github/actions/install-deps/action.yml @@ -14,7 +14,11 @@ runs: shell: bash - name: Install ccache, ninja (Windows) run: choco install ccache ninja - if: runner.os == 'Windows' + if: startsWith(matrix.os, 'windows') + shell: bash + - name: Install cargo (Windows-arm) + run: choco install rust + if: matrix.os == 'windows-11-arm' shell: bash - name: Install ccache, ninja (Linux) run: sudo apt-get install -y ccache ninja-build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e30e11b..4efdcee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,6 +48,9 @@ jobs: - artifact: x86_64-windows os: windows-2022 + - artifact: arm64-windows + os: windows-11-arm + env: ${{ matrix.env || fromJSON('{}') }} steps: - uses: actions/checkout@v4 @@ -102,7 +105,7 @@ jobs: # # As of 2024-07-22 this sha is the "v1.13.0" tag. - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 - if: runner.os == 'Windows' + if: startsWith(matrix.os, 'windows') - name: Build and test (Windows) run: | # Delete a troublesome binary as recommended here @@ -117,7 +120,7 @@ jobs: mkdir build cp -r C:/wasi-sdk/dist build shell: bash - if: runner.os == 'Windows' + if: startsWith(matrix.os, 'windows') # Upload the `dist` folder from the build as the artifacts for this # runner.