Merge pull request xmake-io#6056 from ifarbod/ci/arm64-windows

Add native Windows on ARM64 builds for CI
A2va · Jan 16, 2025 · d621569 · d621569
2 parents 2bf33a0 + fbf3e7b
commit d621569
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019, windows-2022]
-        arch: [x64, x86]
+        arch: [x64, x86, arm64]
 
     runs-on: ${{ matrix.os }}
 
@@ -50,6 +50,8 @@ jobs:
         run: |
           if ("${{ matrix.arch }}" -eq "x64") {
             Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
+          } elseif ("${{ matrix.arch }}" -eq "arm64") {
+            Write-Output "RELEASE_NAME=arm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
           } else {
             Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
           }
@@ -74,6 +76,7 @@ jobs:
           cd ..
 
       - name: Tests
+        if: matrix.arch != 'arm64'
         run: |
           Copy-Item ./core/build/xmake.exe ./xmake
           Copy-Item ./scripts/xrepo.bat ./xmake
@@ -204,4 +207,3 @@ jobs:
           asset_path: artifacts/${{env.RELEASE_NAME}}/xmake.exe
           asset_name: xmake-${{ steps.tagName.outputs.tag }}.${{ env.RELEASE_NAME }}xp.exe
           asset_content_type: application/zip
-
diff --git a/.github/workflows/windows_luajit.yml b/.github/workflows/windows_luajit.yml
@@ -39,6 +39,8 @@ jobs:
         run: |
           if ("${{ matrix.arch }}" -eq "x64") {
             Write-Output "RELEASE_NAME=win64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
+          } elseif ("${{ matrix.arch }}" -eq "arm64") {
+            Write-Output "RELEASE_NAME=arm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
           } else {
             Write-Output "RELEASE_NAME=win32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append
           }
@@ -91,5 +93,3 @@ jobs:
         with:
           name: xmake-latest.${{ env.RELEASE_NAME }}.sha256
           path: artifacts/${{env.RELEASE_NAME}}/shafile
-
-