From fc9fa469d1a9a2603f7fcaba318e9a93f62abf7f Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Mon, 12 May 2025 19:29:43 +0200 Subject: [PATCH 1/4] Run tests on windows-11-arm --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3978a41f2..ccc289198 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,14 +87,21 @@ jobs: windows-vcpkg: name: windows-vcpkg - runs-on: windows-latest + strategy: + matrix: + os: + - runner: windows-latest + arch: x64 + - runner: windows-11-arm + arch: aarch64 + runs-on: {{ matrix.os.runner }} steps: - uses: actions/checkout@v4 - uses: sfackler/actions/rustup@master - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT id: rust-version - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - - run: vcpkg install openssl:x64-windows-static-md + - run: vcpkg install openssl:{{ matrix.os.arch }}-windows-static-md - uses: actions/cache@v4 with: path: ~/.cargo/registry/index From a43f3fdde475b7e84c6fe7c5fe4838b6426efc38 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Mon, 12 May 2025 19:33:10 +0200 Subject: [PATCH 2/4] typo --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccc289198..32431ce45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,14 +94,14 @@ jobs: arch: x64 - runner: windows-11-arm arch: aarch64 - runs-on: {{ matrix.os.runner }} + runs-on: ${{ matrix.os.runner }} steps: - uses: actions/checkout@v4 - uses: sfackler/actions/rustup@master - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT id: rust-version - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - - run: vcpkg install openssl:{{ matrix.os.arch }}-windows-static-md + - run: vcpkg install openssl:${{ matrix.os.arch }}-windows-static-md - uses: actions/cache@v4 with: path: ~/.cargo/registry/index From f05f8c140b6b0869e65079e7d918d3fa4628e7e1 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Mon, 12 May 2025 19:35:27 +0200 Subject: [PATCH 3/4] get rustup --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32431ce45..ab87980ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,6 +97,8 @@ jobs: runs-on: ${{ matrix.os.runner }} steps: - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + if: matrix.os.runner == 'windows-11-arm' - uses: sfackler/actions/rustup@master - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT id: rust-version From f86cd57c004785a4382fdd2fce65bac410f98484 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Mon, 12 May 2025 19:36:54 +0200 Subject: [PATCH 4/4] fix arch name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab87980ce..971c339e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: - runner: windows-latest arch: x64 - runner: windows-11-arm - arch: aarch64 + arch: arm64 runs-on: ${{ matrix.os.runner }} steps: - uses: actions/checkout@v4