Skip to content

Added ARM64 to the CI jobs for Linux and Windows #2719

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

Merged
nickclark2016 merged 1 commit into from
Jun 23, 2026
+31 −11
Merged

Added ARM64 to the CI jobs for Linux and Windows #2719

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
20 changes: 16 additions & 4 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ on: [push, pull_request]

jobs:
linux:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
config: [debug, release]
platform: [x64]
platform: [x64, ARM64]
depsrc: [none, contrib, system]
cc: [gcc, clang]
include:
- platform: x64
os: ubuntu-latest
- platform: ARM64
os: ubuntu-24.04-arm
timeout-minutes: 15
steps:
- name: Checkout
Expand Down Expand Up @@ -59,13 +64,20 @@ jobs:
name: premake-macosx-${{ matrix.platform }}
path: bin/${{ matrix.config }}/
windows:
runs-on: windows-2022
runs-on: ${{ matrix.os }}
strategy:
matrix:
config: [debug, release]
platform: [Win32, x64]
platform: [Win32, x64, ARM64]
msdev: [vs2022]
cc: [msc, clang]
include:
- platform: Win32
os: windows-2022
- platform: x64
os: windows-2022
- platform: ARM64
os: windows-11-arm
timeout-minutes: 15
steps:
- name: Checkout
Expand Down
20 changes: 14 additions & 6 deletions Bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ REM ===========================================================================
SET "PlatformArg="
SET "ConfigArg="

IF NOT "%PLATFORM%" == "" (
SET "PlatformArg=PLATFORM=%PLATFORM%"
) ELSE (
IF "%PLATFORM%" == "" (
IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
SET "PlatformArg=PLATFORM=x64"
SET "PLATFORM=x64"
) ELSE IF "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
SET "PLATFORM=ARM64"
) ELSE (
SET "PlatformArg=PLATFORM=Win32"
SET "PLATFORM=Win32"
)
)

SET "PlatformArg=PLATFORM=%PLATFORM%"

IF NOT "%CONFIG%" == "" (
SET "ConfigArg=CONFIG=%CONFIG%"
)
Expand Down Expand Up @@ -122,6 +124,12 @@ IF NOT EXIST %VsWherePath% (
SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVersionMax%) -property installationPath"

FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
IF /I "%PLATFORM%" == "ARM64" (
IF EXIST "%%i\VC\Auxiliary\Build\vcvarsarm64.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvarsarm64.bat" && CALL :Build
EXIT /B !ERRORLEVEL!
)
)
IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && CALL :Build
EXIT /B !ERRORLEVEL!
Expand All @@ -133,7 +141,7 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
)
)

ECHO Could not find vcvars64.bat or vcvars32.bat to setup Visual Studio environment
ECHO Could not find a suitable vcvars batch file to setup Visual Studio environment
EXIT /B 2

REM :VsWhereVisualBootstrap
Expand Down
2 changes: 1 addition & 1 deletion premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
filter { "system:windows", "options:arch=ARM" }
platforms { "ARM" }

filter { "system:windows", "options:arch=AARCH64" }
filter { "system:windows", "options:arch=AARCH64 or arch=ARM64" }
platforms { "ARM64" }

filter { "system:windows", "options:arch=x86 or arch=Win32" }
Expand Down
Loading