Merge branch 'master' into support_arm64
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c81aaef..cce9a5b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,7 +23,7 @@
jobs:
windows_build:
name: Windows Build (vcpkg / ${{ matrix.triplet }})
- runs-on: [windows-latest]
+ runs-on: ${{ matrix.runs_on }}
strategy:
fail-fast: false
matrix:
@@ -31,15 +31,27 @@
- triplet: x86-windows-dynamic
arch: '-A Win32'
build_shared_libs: 'ON'
+ runs_on: windows-latest
- triplet: x64-windows-dynamic
arch: '-A x64'
build_shared_libs: 'ON'
+ runs_on: windows-latest
+ - triplet: arm64-windows-dynamic
+ arch: '-A ARM64'
+ build_shared_libs: 'ON'
+ runs_on: windows-11-arm
- triplet: x86-windows-static
arch: '-A Win32'
build_shared_libs: 'OFF'
+ runs_on: windows-latest
- triplet: x64-windows-static
arch: '-A x64'
build_shared_libs: 'OFF'
+ runs_on: windows-latest
+ - triplet: arm64-windows-static
+ arch: '-A ARM64'
+ build_shared_libs: 'OFF'
+ runs_on: windows-11-arm
env:
VCPKG_VERSION: '2022.11.14'
@@ -61,12 +73,10 @@
- name: Download vcpkg
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
- # wget doesn't seem to work under bash.
shell: 'powershell'
run: |
- C:\msys64\usr\bin\wget.exe -nv `
- https://github.com/microsoft/vcpkg/archive/refs/tags/${{ env.VCPKG_VERSION }}.zip `
- -O vcpkg.zip
+ Invoke-WebRequest -Uri "https://github.com/microsoft/vcpkg/archive/refs/tags/${{ env.VCPKG_VERSION }}.zip" -OutFile "vcpkg.zip"
+
- name: Bootstrap vcpkg
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
shell: 'bash'
