Skip to content

Commit bfedf26

Browse files
authored
Migrate to a new set of github runners (#24)
1 parent 46619ba commit bfedf26

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ jobs:
3838
runs-on: ${{ matrix.os }}
3939
strategy:
4040
matrix:
41-
# macos-13 is x86, latest is arm64 (https://cibuildwheel.pypa.io/en/stable/setup/#github-actions)
42-
os: [windows-latest, ubuntu-latest, macos-13, macos-latest]
41+
os:
42+
- windows-11-arm # Windows arm64 wheels
43+
- windows-latest # Windows x86-64 wheels
44+
- ubuntu-latest # All linux wheels (via emulation)
45+
- macos-15-intel # macOS x86-64 wheels
46+
- macos-15 # macOS arm64 wheels
4347

4448
steps:
4549
- uses: actions/checkout@v5
@@ -52,7 +56,7 @@ jobs:
5256
- uses: ilammy/msvc-dev-cmd@v1
5357
if: runner.os == 'Windows'
5458
with:
55-
arch: x64
59+
arch: ${{ runner.arch }}
5660

5761
- name: Enable Xcode SDK
5862
if: runner.os == 'macOS'

scripts/cmake/bundled-vcpkg.cmake

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,20 @@ if(WIN32)
8585
unset(ENV{VCPKG_TARGET_TRIPLET})
8686
endif()
8787

88-
if (DEFINED VCPKG_TARGET_TRIPLET AND NOT "${VCPKG_TARGET_TRIPLET}" STREQUAL "x64-windows-static")
89-
message(WARNING "Vcpkg target triplet has been redefined from \"${VCPKG_TARGET_TRIPLET}\" to \"x64-windows-static\"")
88+
if ("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "AMD64")
89+
set(OVERRIDE_VCPKG_TARGET_TRIPLET "x64-windows-static")
90+
elseif("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64")
91+
set(OVERRIDE_VCPKG_TARGET_TRIPLET "arm64-windows-static")
92+
else()
93+
message(FATAL_ERROR "Unsupported architecture \"$ENV{PROCESSOR_ARCHITECTURE}\"")
94+
endif()
95+
96+
if (DEFINED VCPKG_TARGET_TRIPLET AND NOT "${VCPKG_TARGET_TRIPLET}" STREQUAL "${OVERRIDE_VCPKG_TARGET_TRIPLET}")
97+
message(WARNING "Vcpkg target triplet has been redefined from \"${VCPKG_TARGET_TRIPLET}\" to \"${OVERRIDE_VCPKG_TARGET_TRIPLET}\"")
9098
endif()
9199

92100
unset(VCPKG_TARGET_TRIPLET)
93101
unset(VCPKG_TARGET_TRIPLET CACHE)
94-
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "")
102+
set(VCPKG_TARGET_TRIPLET "${OVERRIDE_VCPKG_TARGET_TRIPLET}" CACHE STRING "")
103+
unset(OVERRIDE_VCPKG_TARGET_TRIPLET)
95104
endif()

0 commit comments

Comments
 (0)