Skip to content

Commit b146801

Browse files
mhegazymhegazy
authored
GHA: Improve experimental SDK builds
Enable building the C++ interop libraries, Swift remote mirror, and remove the unnecessary flag addition for the experimental SDK builds.
1 parent be134d7 commit b146801

File tree

1 file changed

+3
-89
lines changed

1 file changed

+3
-89
lines changed

‎.github/workflows/swift-toolchain.yml‎

Lines changed: 3 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,17 +2369,6 @@ jobs:
23692369
if ("${{ matrix.os }}" -eq "Android") {
23702370
# Used by matrix definitions.
23712371
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2372-
}
2373-
2374-
if ("${{ matrix.os }}" -eq "Windows") {
2375-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2376-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2377-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2378-
$SwiftFlags += " -strict-implicit-module-context"
2379-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2380-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2381-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2382-
} elseif ("${{ matrix.os }}" -eq "Android") {
23832372
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
23842373
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
23852374
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2411,6 +2400,7 @@ jobs:
24112400
-G Ninja `
24122401
-S ${{ github.workspace }}/SourceCache/swift/Runtimes/Core `
24132402
-D SwiftCore_ENABLE_CONCURRENCY=YES `
2403+
-D SwiftCore_ENABLE_REMOTE_MIRROR=YES `
24142404
-D dispatch_DIR=${{ github.workspace }}/BinaryCache/libdispatch-c/cmake/modules
24152405
- name: Build Experimental Runtime
24162406
if: matrix.os != 'Android' || inputs.build_android
@@ -2433,17 +2423,6 @@ jobs:
24332423
if ("${{ matrix.os }}" -eq "Android") {
24342424
# Used by matrix definitions.
24352425
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2436-
}
2437-
2438-
if ("${{ matrix.os }}" -eq "Windows") {
2439-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2440-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2441-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2442-
$SwiftFlags += " -strict-implicit-module-context"
2443-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2444-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2445-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2446-
} elseif ("${{ matrix.os }}" -eq "Android") {
24472426
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
24482427
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
24492428
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2473,7 +2452,8 @@ jobs:
24732452
${{ matrix.extra_flags }} `
24742453
-G Ninja `
24752454
-S ${{ github.workspace }}/SourceCache/swift/Runtimes/Overlay `
2476-
-D SwiftCore_DIR=${{ github.workspace }}/BinaryCache/ExperimentalRuntime/cmake/SwiftCore
2455+
-D SwiftCore_DIR=${{ github.workspace }}/BinaryCache/ExperimentalRuntime/cmake/SwiftCore `
2456+
-D SwiftOverlay_ENABLE_CXX_INTEROP=YES
24772457
- name: Build Experimental Overlay
24782458
if: matrix.os != 'Android' || inputs.build_android
24792459
run: |
@@ -2495,17 +2475,6 @@ jobs:
24952475
if ("${{ matrix.os }}" -eq "Android") {
24962476
# Used by matrix definitions.
24972477
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2498-
}
2499-
2500-
if ("${{ matrix.os }}" -eq "Windows") {
2501-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2502-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2503-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2504-
$SwiftFlags += " -strict-implicit-module-context"
2505-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2506-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2507-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2508-
} elseif ("${{ matrix.os }}" -eq "Android") {
25092478
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
25102479
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
25112480
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2553,17 +2522,6 @@ jobs:
25532522
if ("${{ matrix.os }}" -eq "Android") {
25542523
# Used by matrix definitions.
25552524
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2556-
}
2557-
2558-
if ("${{ matrix.os }}" -eq "Windows") {
2559-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2560-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2561-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2562-
$SwiftFlags += " -strict-implicit-module-context"
2563-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2564-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2565-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2566-
} elseif ("${{ matrix.os }}" -eq "Android") {
25672525
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
25682526
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
25692527
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2612,17 +2570,6 @@ jobs:
26122570
if ("${{ matrix.os }}" -eq "Android") {
26132571
# Used by matrix definitions.
26142572
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2615-
}
2616-
2617-
if ("${{ matrix.os }}" -eq "Windows") {
2618-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2619-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2620-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2621-
$SwiftFlags += " -strict-implicit-module-context"
2622-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2623-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2624-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2625-
} elseif ("${{ matrix.os }}" -eq "Android") {
26262573
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
26272574
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
26282575
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2675,17 +2622,6 @@ jobs:
26752622
if ("${{ matrix.os }}" -eq "Android") {
26762623
# Used by matrix definitions.
26772624
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2678-
}
2679-
2680-
if ("${{ matrix.os }}" -eq "Windows") {
2681-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2682-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2683-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2684-
$SwiftFlags += " -strict-implicit-module-context"
2685-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2686-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2687-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2688-
} elseif ("${{ matrix.os }}" -eq "Android") {
26892625
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
26902626
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
26912627
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2734,17 +2670,6 @@ jobs:
27342670
if ("${{ matrix.os }}" -eq "Android") {
27352671
# Used by matrix definitions.
27362672
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2737-
}
2738-
2739-
if ("${{ matrix.os }}" -eq "Windows") {
2740-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2741-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2742-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2743-
$SwiftFlags += " -strict-implicit-module-context"
2744-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2745-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2746-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2747-
} elseif ("${{ matrix.os }}" -eq "Android") {
27482673
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
27492674
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
27502675
$SwiftFlags += " -resource-dir $SwiftResourceDir"
@@ -2798,17 +2723,6 @@ jobs:
27982723
if ("${{ matrix.os }}" -eq "Android") {
27992724
# Used by matrix definitions.
28002725
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2801-
}
2802-
2803-
if ("${{ matrix.os }}" -eq "Windows") {
2804-
$WINDOWS_VFS_OVERLAY = cygpath -m "${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml"
2805-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift"
2806-
$SwiftFlags += " -vfsoverlay ${WINDOWS_VFS_OVERLAY}"
2807-
$SwiftFlags += " -strict-implicit-module-context"
2808-
$SwiftFlags += " -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules"
2809-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2810-
$SwiftFlags += " -L $SwiftResourceDir/windows"
2811-
} elseif ("${{ matrix.os }}" -eq "Android") {
28122726
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
28132727
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
28142728
$SwiftFlags += " -resource-dir $SwiftResourceDir"

0 commit comments

Comments
 (0)