Skip to content

Commit d013ae3

Browse files
author
kendal
committed
Install Andoid NDK before all CMake steps
This prevents the workflow from failing on runners where an NDK is not preinstalled.
1 parent 087a9dc commit d013ae3

File tree

1 file changed

+115
-20
lines changed

1 file changed

+115
-20
lines changed

‎.github/workflows/swift-toolchain.yml

+115-20
Original file line numberDiff line numberDiff line change
@@ -271,23 +271,23 @@ jobs:
271271
cxx: cl
272272
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
273273
os: Windows
274-
extra_flags:
274+
extra_flags:
275275

276276
- arch: arm64
277277
cc: cl
278278
cflags: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
279279
cxx: cl
280280
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
281281
os: Windows
282-
extra_flags:
282+
extra_flags:
283283

284284
- arch: x86
285285
cc: cl
286286
cflags: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
287287
cxx: cl
288288
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
289289
os: Windows
290-
extra_flags:
290+
extra_flags:
291291

292292
- arch: arm64
293293
cc: clang
@@ -339,7 +339,6 @@ jobs:
339339
run: Copy-Item ${{ github.workspace }}\SourceCache\swift-build\cmake\SQLite\CMakeLists.txt -destination ${{ github.workspace }}\SourceCache\sqlite-3.43.2\CMakeLists.txt
340340

341341
- uses: compnerd/gha-setup-vsdevenv@main
342-
if: matrix.os == 'Windows'
343342
with:
344343
host_arch: amd64
345344
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -353,9 +352,30 @@ jobs:
353352
variant: sccache
354353
append-timestamp: false
355354

355+
# TODO(https://github.com/thebrowsercompany/swift-build/issues/167): Replace this with a composite action.
356+
- name: Download Android NDK
357+
if: matrix.os == 'Android'
358+
run: |
359+
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
360+
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
361+
curl.exe -sL $NDKURL -o $env:TEMP\android-ndk-r26b-windows.zip
362+
$SHA256 = Get-FileHash -Path $env:TEMP\android-ndk-r26b-windows.zip -Algorithm SHA256
363+
if ($SHA256.Hash -ne $NDKHash) {
364+
throw "NDK SHA256 mismatch ($($SHA256.Hash) vs $$NDKHash)"
365+
}
366+
367+
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
368+
369+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
370+
Test-Path -Path $NDKPATH
371+
372+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
373+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
374+
356375
- name: Configure SQLite
357376
run: |
358377
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
378+
359379
cmake -B ${{ github.workspace }}/BinaryCache/sqlite-3.43.2 `
360380
-D BUILD_SHARED_LIBS=NO `
361381
-D CMAKE_BUILD_TYPE=Release `
@@ -558,7 +578,6 @@ jobs:
558578
Copy-Item ${{ github.workspace }}\SourceCache\swift-installer-scripts\shared\ICU\icupkg.inc.cmake -destination ${{ github.workspace }}\SourceCache\icu\icu4c\icupkg.inc.cmake
559579
560580
- uses: compnerd/gha-setup-vsdevenv@main
561-
if: matrix.os == 'Windows'
562581
with:
563582
host_arch: amd64
564583
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -572,9 +591,29 @@ jobs:
572591
variant: sccache
573592
append-timestamp: false
574593

594+
- name: Download Android NDK
595+
if: matrix.os == 'Android'
596+
run: |
597+
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
598+
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
599+
curl.exe -sL $NDKURL -o $env:TEMP\android-ndk-r26b-windows.zip
600+
$SHA256 = Get-FileHash -Path $env:TEMP\android-ndk-r26b-windows.zip -Algorithm SHA256
601+
if ($SHA256.Hash -ne $NDKHash) {
602+
throw "NDK SHA256 mismatch ($($SHA256.Hash) vs $$NDKHash)"
603+
}
604+
605+
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
606+
607+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
608+
Test-Path -Path $NDKPATH
609+
610+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
611+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
612+
575613
- name: Configure ICU
576614
run: |
577615
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
616+
578617
cmake -B ${{ github.workspace }}/BinaryCache/icu-69.1 `
579618
-D BUILD_SHARED_LIBS=NO `
580619
-D BUILD_TOOLS=${{ matrix.BUILD_TOOLS }} `
@@ -1090,7 +1129,6 @@ jobs:
10901129
show-progress: false
10911130

10921131
- uses: compnerd/gha-setup-vsdevenv@main
1093-
if: matrix.os == 'Windows'
10941132
with:
10951133
host_arch: amd64
10961134
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -1104,9 +1142,29 @@ jobs:
11041142
variant: sccache
11051143
append-timestamp: false
11061144

1145+
- name: Download Android NDK
1146+
if: matrix.os == 'Android'
1147+
run: |
1148+
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
1149+
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
1150+
curl.exe -sL $NDKURL -o $env:TEMP\android-ndk-r26b-windows.zip
1151+
$SHA256 = Get-FileHash -Path $env:TEMP\android-ndk-r26b-windows.zip -Algorithm SHA256
1152+
if ($SHA256.Hash -ne $NDKHash) {
1153+
throw "NDK SHA256 mismatch ($($SHA256.Hash) vs $$NDKHash)"
1154+
}
1155+
1156+
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
1157+
1158+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
1159+
Test-Path -Path $NDKPATH
1160+
1161+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1162+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1163+
11071164
- name: Configure zlib
11081165
run: |
11091166
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
1167+
11101168
cmake -B ${{ github.workspace }}/BinaryCache/zlib-1.3 `
11111169
-D BUILD_SHARED_LIBS=NO `
11121170
-D CMAKE_BUILD_TYPE=Release `
@@ -1213,7 +1271,6 @@ jobs:
12131271
path: ${{ github.workspace }}/BuildRoot/Library/zlib-1.3/usr
12141272

12151273
- uses: compnerd/gha-setup-vsdevenv@main
1216-
if: matrix.os == 'Windows'
12171274
with:
12181275
host_arch: amd64
12191276
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -1227,6 +1284,25 @@ jobs:
12271284
variant: sccache
12281285
append-timestamp: false
12291286

1287+
- name: Download Android NDK
1288+
if: matrix.os == 'Android'
1289+
run: |
1290+
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
1291+
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
1292+
curl.exe -sL $NDKURL -o $env:TEMP\android-ndk-r26b-windows.zip
1293+
$SHA256 = Get-FileHash -Path $env:TEMP\android-ndk-r26b-windows.zip -Algorithm SHA256
1294+
if ($SHA256.Hash -ne $NDKHash) {
1295+
throw "NDK SHA256 mismatch ($($SHA256.Hash) vs $$NDKHash)"
1296+
}
1297+
1298+
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
1299+
1300+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
1301+
Test-Path -Path $NDKPATH
1302+
1303+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1304+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1305+
12301306
- name: Configure curl
12311307
run: |
12321308
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
@@ -1408,7 +1484,6 @@ jobs:
14081484
show-progress: false
14091485

14101486
- uses: compnerd/gha-setup-vsdevenv@main
1411-
if: matrix.os == 'Windows'
14121487
with:
14131488
host_arch: amd64
14141489
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -1422,9 +1497,29 @@ jobs:
14221497
variant: sccache
14231498
append-timestamp: false
14241499

1500+
- name: Download Android NDK
1501+
if: matrix.os == 'Android'
1502+
run: |
1503+
$NDKURL = "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip"
1504+
$NDKHash = "A478D43D4A45D0D345CDA6BE50D79642B92FB175868D9DC0DFC86181D80F691E"
1505+
curl.exe -sL $NDKURL -o $env:TEMP\android-ndk-r26b-windows.zip
1506+
$SHA256 = Get-FileHash -Path $env:TEMP\android-ndk-r26b-windows.zip -Algorithm SHA256
1507+
if ($SHA256.Hash -ne $NDKHash) {
1508+
throw "NDK SHA256 mismatch ($($SHA256.Hash) vs $$NDKHash)"
1509+
}
1510+
1511+
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
1512+
1513+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
1514+
Test-Path -Path $NDKPATH
1515+
1516+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1517+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1518+
14251519
- name: Configure libxml2
14261520
run: |
14271521
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
1522+
14281523
cmake -B ${{ github.workspace }}/BinaryCache/libxml2-2.11.5 `
14291524
-D BUILD_SHARED_LIBS=NO `
14301525
-D CMAKE_BUILD_TYPE=Release `
@@ -1492,7 +1587,7 @@ jobs:
14921587
os: Windows
14931588
llvm_flags:
14941589
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}"'
1495-
extra_flags:
1590+
extra_flags:
14961591

14971592
- arch: x86
14981593
cpu: 'i686'
@@ -1506,7 +1601,7 @@ jobs:
15061601
os: Windows
15071602
llvm_flags:
15081603
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}"'
1509-
extra_flags:
1604+
extra_flags:
15101605

15111606
- arch: arm64
15121607
cpu: 'aarch64'
@@ -1520,7 +1615,7 @@ jobs:
15201615
os: Android
15211616
llvm_flags: -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DLLVM_HOST_TRIPLE=aarch64-unknown-linux-android${{ needs.context.outputs.ANDROID_API_LEVEL }}
15221617
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}"'
1523-
extra_flags: -D CMAKE_ANDROID_NDK=$NDKPATH -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
1618+
extra_flags: -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
15241619

15251620
- arch: armv7
15261621
cpu: armv7
@@ -1534,7 +1629,7 @@ jobs:
15341629
os: Android
15351630
llvm_flags: -DCMAKE_SYSTEM_PROCESSOR=armv7-a -DLLVM_HOST_TRIPLE=armv7a-unknown-linux-androideabi${{ needs.context.outputs.ANDROID_API_LEVEL }}
15361631
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}"'
1537-
extra_flags: -D CMAKE_ANDROID_NDK=$NDKPATH -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
1632+
extra_flags: -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
15381633

15391634
- arch: i686
15401635
cpu: i686
@@ -1548,7 +1643,7 @@ jobs:
15481643
os: Android
15491644
llvm_flags: -DCMAKE_SYSTEM_PROCESSOR=i686 -DLLVM_HOST_TRIPLE=i686-unknown-linux-android${{ needs.context.outputs.ANDROID_API_LEVEL }}
15501645
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}"'
1551-
extra_flags: -D CMAKE_ANDROID_NDK=$NDKPATH -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86 "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
1646+
extra_flags: -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86 "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
15521647

15531648
- arch: x86_64
15541649
cpu: 'x86_64'
@@ -1562,7 +1657,7 @@ jobs:
15621657
os: Android
15631658
llvm_flags: -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DLLVM_HOST_TRIPLE=x86_64-unknown-linux-android${{ needs.context.outputs.ANDROID_API_LEVEL }}
15641659
linker_flags: '-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_EXE_LINKER_FLAGS }}" -D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.ANDROID_CMAKE_SHARED_LINKER_FLAGS }}"'
1565-
extra_flags: -D CMAKE_ANDROID_NDK=$NDKPATH -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86_64 "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
1660+
extra_flags: -D SWIFT_ANDROID_NDK_PATH=$NDKPATH -DSWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT=YES -DLLVM_ENABLE_LIBCXX=YES -DSWIFT_USE_LINKER=lld -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86_64 "-DCMAKE_MAKE_PROGRAM=$NINJA_PATH"
15661661

15671662
name: ${{ matrix.os }} ${{ matrix.arch }} SDK
15681663

@@ -1648,7 +1743,6 @@ jobs:
16481743
show-progress: false
16491744

16501745
- uses: compnerd/gha-setup-vsdevenv@main
1651-
if: matrix.os == 'Windows'
16521746
with:
16531747
host_arch: amd64
16541748
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -1675,11 +1769,16 @@ jobs:
16751769
16761770
Expand-Archive -Path $env:TEMP\android-ndk-r26b-windows.zip -DestinationPath ${{ github.workspace }}\BuildRoot\Library -Force
16771771
1772+
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
1773+
Test-Path -Path $NDKPATH
1774+
1775+
"ANDROID_NDK=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1776+
"ANDROID_NDK_ROOT=$NDKPATH" | Out-File -Encoding utf8 -Append $env:GITHUB_ENV
1777+
16781778
- name: Configure LLVM
16791779
run: |
16801780
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
16811781
$CLANG_CL = "cl"
1682-
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
16831782
16841783
Remove-Item env:\SDKROOT
16851784
cmake -B ${{ github.workspace }}/BinaryCache/llvm `
@@ -1703,7 +1802,6 @@ jobs:
17031802
$CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
17041803
17051804
$SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
1706-
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
17071805
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
17081806
17091807
$CMAKE_CPU = if ("${{ matrix.cpu }}" -eq "armv7") { "armv7-a" } else { "${{ matrix.cpu }}" }
@@ -1759,7 +1857,6 @@ jobs:
17591857
# Workaround CMake 3.20 issue
17601858
$CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
17611859
$SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
1762-
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
17631860
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
17641861
17651862
$WIN_OVERLAY_PATH = cygpath -m ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml
@@ -1803,7 +1900,6 @@ jobs:
18031900
# Workaround CMake 3.20 issue
18041901
$CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
18051902
$SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
1806-
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
18071903
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
18081904
18091905
$WIN_OVERLAY_PATH = cygpath -m ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml
@@ -1871,7 +1967,6 @@ jobs:
18711967
# Workaround CMake 3.20 issue
18721968
$CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
18731969
$SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
1874-
$NDKPATH = cygpath -m ${{ github.workspace }}/BuildRoot/Library/android-ndk-r26b
18751970
$NINJA_PATH = "$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products * -nologo -latest -property installationPath)\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
18761971
18771972
$WIN_OVERLAY_PATH = cygpath -m ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml

0 commit comments

Comments
 (0)