From 98a2120348790f64b377ce2b929058bf18bbefd6 Mon Sep 17 00:00:00 2001 From: iFarbod Date: Sat, 11 Jan 2025 04:02:01 +0330 Subject: [PATCH 1/3] Add native Windows on ARM64 builds for CI --- .github/workflows/windows.yml | 5 +++-- .github/workflows/windows_luajit.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e13339814cc..e3f7d1fa4a7 100644 --- 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=winarm64" | 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 } @@ -204,4 +206,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 index 228f8003f9f..8f8ce8e6c95 100644 --- a/.github/workflows/windows_luajit.yml +++ b/.github/workflows/windows_luajit.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [windows-2019, windows-2022] - arch: [x64, x86] + arch: [x64, x86, arm64] runs-on: ${{ matrix.os }} @@ -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=winarm64" | 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 - - From e306bbff7edda3f110365a8ba1edb13cee5dd5d7 Mon Sep 17 00:00:00 2001 From: iFarbod Date: Sat, 11 Jan 2025 18:05:10 +0330 Subject: [PATCH 2/3] Rename winarm64 to arm64 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e3f7d1fa4a7..d5fea908956 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,7 +51,7 @@ jobs: 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=winarm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append + 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 } From 94e7330ef77040b3ba4862cf475c996c19905a92 Mon Sep 17 00:00:00 2001 From: iFarbod Date: Sat, 11 Jan 2025 18:06:03 +0330 Subject: [PATCH 3/3] Rename to arm64 in windows_luajit.yml --- .github/workflows/windows_luajit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_luajit.yml b/.github/workflows/windows_luajit.yml index 8f8ce8e6c95..4cd20bb0a0c 100644 --- a/.github/workflows/windows_luajit.yml +++ b/.github/workflows/windows_luajit.yml @@ -40,7 +40,7 @@ jobs: 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=winarm64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append + 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 }