Skip to content

Commit 8937581

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

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/msbuild.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ 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
2223
runs-on: windows-latest
@@ -33,25 +34,27 @@ 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')}}
42+
shell: cmd
4143
working-directory: ${{env.GITHUB_WORKSPACE}}
4244
run: |
4345
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run DeadLock -Engine=SlimDetours
4446
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run DelayHook
4547
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run TwiceSimpleHook
4648
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run Instruction
47-
- name: Build [NT5]
49+
- name: Build [NT5] (x64, x86)
4850
if: ${{ matrix.platform == 'x64' || matrix.platform == 'x86' }}
4951
working-directory: ${{env.GITHUB_WORKSPACE}}
5052
run: |
5153
set CL=/D_WIN32_WINNT=0x0500
5254
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]
55+
- name: Run demos and tests [NT5] (x64, x86)
5456
if: ${{ matrix.platform == 'x64' || matrix.platform == 'x86' }}
57+
shell: cmd
5558
working-directory: ${{env.GITHUB_WORKSPACE}}
5659
run: |
5760
.\Source\OutDir\${{matrix.platform}}\${{matrix.config}}\Demo.exe -Run DeadLock -Engine=SlimDetours

0 commit comments

Comments
 (0)