Skip to content

Commit 30ff0bc

Browse files
committed
[GITHUB] Add ARM64 hosted runner and ARM64EC build
1 parent 72d113c commit 30ff0bc

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/msbuild.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ jobs:
1616
build:
1717
strategy:
1818
matrix:
19-
platform: [x64, x86, ARM64]
19+
os: [windows-latest, windows-11-arm]
20+
platform: [x64, x86, ARM64, ARM64EC]
2021
config: [Debug, Release]
2122
fail-fast: false
22-
runs-on: windows-latest
23+
runs-on: ${{matrix.os}}
2324
steps:
2425
- name: Source checkout
2526
uses: actions/checkout@main
@@ -33,24 +34,24 @@ jobs:
3334
- name: Archive outputs
3435
uses: actions/upload-artifact@main
3536
with:
36-
name: KNSoft.SlimDetours-${{matrix.platform}}-${{matrix.config}}-${{github.sha}}
37+
name: KNSoft.SlimDetours-${{matrix.os}}-${{matrix.platform}}-${{matrix.config}}-${{github.sha}}
3738
path: |
3839
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}
39-
- name: Run demos and tests (x64, x86)
40-
if: ${{ matrix.platform == 'x64' || matrix.platform == 'x86' }}
40+
- name: Run demos and tests
41+
if: ${{(matrix.os == 'windows-latest' && (matrix.platform == 'x64' || matrix.platform == 'x86') || matrix.os == 'windows-11-arm')}}
4142
working-directory: ${{env.GITHUB_WORKSPACE}}
4243
run: |
4344
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run DeadLock -Engine=SlimDetours
4445
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run DelayHook
4546
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run TwiceSimpleHook
4647
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run Instruction
47-
- name: Build [NT5]
48+
- name: Build [NT5] (x64, x86)
4849
if: ${{ matrix.platform == 'x64' || matrix.platform == 'x86' }}
4950
working-directory: ${{env.GITHUB_WORKSPACE}}
5051
run: |
5152
set CL=/D_WIN32_WINNT=0x0500
5253
msbuild ${{env.SOLUTION_FILE_PATH}} /restore /m /p:Configuration=${{matrix.config}} /p:Platform=${{matrix.platform}} /p:RestorePackagesConfig=true
53-
- name: Run demos and tests (x64, x86) [NT5]
54+
- name: Run demos and tests [NT5] (x64, x86)
5455
if: ${{ matrix.platform == 'x64' || matrix.platform == 'x86' }}
5556
working-directory: ${{env.GITHUB_WORKSPACE}}
5657
run: |

0 commit comments

Comments
 (0)