Skip to content

Commit d621569

Browse files
authored
Merge pull request #6056 from ifarbod/ci/arm64-windows
Add native Windows on ARM64 builds for CI
2 parents 2bf33a0 + fbf3e7b commit d621569

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/windows.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [windows-2019, windows-2022]
14-
arch: [x64, x86]
14+
arch: [x64, x86, arm64]
1515

1616
runs-on: ${{ matrix.os }}
1717

@@ -50,6 +50,8 @@ jobs:
5050
run: |
5151
if ("${{ matrix.arch }}" -eq "x64") {
5252
Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
53+
} elseif ("${{ matrix.arch }}" -eq "arm64") {
54+
Write-Output "RELEASE_NAME=arm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
5355
} else {
5456
Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
5557
}
@@ -74,6 +76,7 @@ jobs:
7476
cd ..
7577
7678
- name: Tests
79+
if: matrix.arch != 'arm64'
7780
run: |
7881
Copy-Item ./core/build/xmake.exe ./xmake
7982
Copy-Item ./scripts/xrepo.bat ./xmake
@@ -204,4 +207,3 @@ jobs:
204207
asset_path: artifacts/${{env.RELEASE_NAME}}/xmake.exe
205208
asset_name: xmake-${{ steps.tagName.outputs.tag }}.${{ env.RELEASE_NAME }}xp.exe
206209
asset_content_type: application/zip
207-

.github/workflows/windows_luajit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
run: |
4040
if ("${{ matrix.arch }}" -eq "x64") {
4141
Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
42+
} elseif ("${{ matrix.arch }}" -eq "arm64") {
43+
Write-Output "RELEASE_NAME=arm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
4244
} else {
4345
Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
4446
}
@@ -91,5 +93,3 @@ jobs:
9193
with:
9294
name: xmake-latest.${{ env.RELEASE_NAME }}.sha256
9395
path: artifacts/${{env.RELEASE_NAME}}/shafile
94-
95-

0 commit comments

Comments
 (0)