diff options
| author | ruki <[email protected]> | 2025-01-16 22:47:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-16 22:47:07 +0800 |
| commit | d6215697caf20a32e681f51b5dc85190835f1c89 (patch) | |
| tree | 5e3dd1a5790cf7a20909a2a789c55da2e7d17765 | |
| parent | 2bf33a0925af585eac7b50f76a31d620073d8b1f (diff) | |
| parent | fbf3e7b2d5736803ea33d805471bf5a3863c6842 (diff) | |
Merge pull request #6056 from ifarbod/ci/arm64-windows
Add native Windows on ARM64 builds for CI
| -rw-r--r-- | .github/workflows/windows.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/windows_luajit.yml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e13339814..68f2e55d7 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=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 index 228f8003f..06f9d51de 100644 --- 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 - - |