Skip to content

Add support for Windows ARM64 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cgutman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for Windows ARM64 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
oses:
description: 'Matrix OSes'
required: true
default: '[ "ubuntu-latest", "windows-latest", "macos-latest" ]'
default: '[ "ubuntu-latest", "windows-latest", "macos-latest", "windows-11-arm" ]'
quiet:
description: 'silence annotation'
required: false
Expand Down Expand Up @@ -46,7 +46,10 @@ jobs:

test-prebuilt-windows:
if: ${{ contains(github.event.inputs.extra_tests, 'prebuilt-windows') }}
runs-on: windows-latest
strategy:
matrix:
os: [windows-latest, windows-11-arm]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: ./
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Know working SDK version for windows/mac/linux:
- 1.4.309.0

##### Available SDK versions:
- [windows.json](https://vulkan.lunarg.com/sdk/versions/windows.json)
- [windows.json](https://vulkan.lunarg.com/sdk/versions/windows.json) / [warm.json](https://vulkan.lunarg.com/sdk/versions/warm.json)
- [linux.json](https://vulkan.lunarg.com/sdk/versions/linux.json)
- [mac.json](https://vulkan.lunarg.com/sdk/versions/mac.json) (version >= 1.3.296.0)
- see also https://vulkan.lunarg.com/sdk/home
Expand Down
8 changes: 7 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,16 @@ runs:
# preset env
basedir=$PWD
runner_os=${RUNNER_OS:-`uname -s`}
runner_arch=${RUNNER_ARCH:-`uname -m`}
case $runner_os in
macOS|Darwin) os=mac ;;
Linux) os=linux ;;
Windows|MINGW*) os=windows ; basedir=$(pwd -W) ;;
Windows|MINGW*)
case $runner_arch in
X64|x86_64) os=windows ;;
ARM64|aarch64) os=warm ;;
*) echo "unknown runner_arch: $runner_arch" ; exit 7 ; ;;
esac ; basedir=$(pwd -W) ;;
*) echo "unknown runner_os: $runner_os" ; exit 7 ; ;;
esac
version=${VULKAN_SDK_VERSION:-${{ inputs.version }}}
Expand Down
7 changes: 6 additions & 1 deletion vulkan_prebuilt_helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function _os_filename() {
case $1 in
mac) echo vulkan_sdk.zip ;;
linux) echo vulkan_sdk.tar.gz ;;
windows) echo vulkan_sdk.exe ;;
windows|warm) echo vulkan_sdk.exe ;;
*) echo "unknown $1" >&2 ; exit 9 ;;
esac
}
Expand Down Expand Up @@ -50,6 +50,11 @@ function install_windows() {
7z x vulkan_sdk.exe -aoa -o$VULKAN_SDK
}

function install_warm() {
# Windows ARM installs the same way as Windows
install_windows
}

function install_mac() {
test -d $VULKAN_SDK && test -f vulkan_sdk.zip
unzip vulkan_sdk.zip
Expand Down