diff options
| author | Chad Engler <englercj@live.com> | 2021-09-29 13:02:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 13:02:47 -0700 |
| commit | aa8f7b899b7b562b3d3c6e25c3da41569505e70c (patch) | |
| tree | f2b2a9b07595e6bb5aac32b1a5c6cb96bcea0349 /.github | |
| parent | 6736b0c1c5fa3e89bc561eb7965a1a0d17af3466 (diff) | |
Fix ARM64 detection for MSVC (#1951)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/release-windows.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 9d8ee94ca..684c8bde9 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: configuration: ['Release'] - platform: ['Win32', 'x64'] + platform: ['Win32', 'x64', 'aarch64'] steps: - uses: actions/checkout@v2.3.4 with: @@ -24,6 +24,10 @@ jobs: - name: premake run: .\premake.bat vs2017 --enable-embed-stdlib=true + - name: msbuild (x64 tools) + if: ${{ matrix.platform == 'aarch64' }} + run: + MSBuild.exe slang.sln -v:m -m -target:slang-cpp-extractor;slang-generate;slang-embed -property:Configuration=Release -property:Platform=x64 -property:WindowsTargetPlatformVersion=10.0.19041.0 - name: msbuild run: MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 @@ -31,7 +35,11 @@ jobs: id: archive run: | echo "achiving files..." - if ("${{matrix.platform}}" -eq "x64") + if ("${{matrix.platform}}" -eq "aarch64") + { + $slangDeployPlatform = "win-aarch64" + } + elseif ("${{matrix.platform}}" -eq "x64") { $slangDeployPlatform = "win64" } @@ -61,7 +69,7 @@ jobs: $srcArchive = "slang-$slangVersion-source.zip" echo "::set-output name=SLANG_SOURCE_ARCHIVE::$srcArchive" - + 7z a "$srcArchive" slang.h 7z a "$srcArchive" slang-com-helper.h 7z a "$srcArchive" slang-com-ptr.h |