@@ -1579,37 +1579,42 @@ jobs:
1579
1579
1580
1580
steps :
1581
1581
- name : Download Compilers
1582
+ if : matrix.os != 'Android' || inputs.build_android
1582
1583
uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
1583
1584
with :
1584
1585
name : compilers-${{ inputs.build_os }}-${{ inputs.build_arch }}
1585
1586
path : ${{ github.workspace }}/BinaryCache/Library
1586
1587
- uses : actions/checkout@v4
1588
+ if : matrix.os != 'Android' || inputs.build_android
1587
1589
with :
1588
1590
repository : swiftlang/llvm-project
1589
1591
ref : ${{ inputs.llvm_project_revision }}
1590
1592
path : ${{ github.workspace }}/SourceCache/llvm-project
1591
1593
show-progress : false
1592
1594
- uses : actions/checkout@v4
1595
+ if : matrix.os != 'Android' || inputs.build_android
1593
1596
with :
1594
1597
repository : swiftlang/swift
1595
1598
ref : ${{ inputs.swift_revision }}
1596
1599
path : ${{ github.workspace }}/SourceCache/swift
1597
1600
show-progress : false
1598
1601
- uses : actions/checkout@v4
1602
+ if : matrix.os != 'Android' || inputs.build_android
1599
1603
with :
1600
1604
repository : apple/swift-corelibs-libdispatch
1601
1605
ref : ${{ inputs.swift_corelibs_libdispatch_revision }}
1602
1606
path : ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
1603
1607
show-progress : false
1604
1608
- uses : actions/checkout@v4
1609
+ if : matrix.os != 'Android' || inputs.build_android
1605
1610
with :
1606
1611
repository : swiftlang/swift-experimental-string-processing
1607
1612
ref : ${{ inputs.swift_experimental_string_processing_revision }}
1608
1613
path : ${{ github.workspace }}/SourceCache/swift-experimental-string-processing
1609
1614
show-progress : false
1610
1615
1611
1616
- name : Install Swift Toolchain
1612
- if : inputs.build_os == 'Windows'
1617
+ if : inputs.build_os == 'Windows' && (matrix.os != 'Android' || inputs.build_android)
1613
1618
uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1614
1619
with :
1615
1620
github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
@@ -1625,6 +1630,7 @@ jobs:
1625
1630
1626
1631
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
1627
1632
- uses : compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
1633
+ if : matrix.os != 'Android' || inputs.build_android
1628
1634
with :
1629
1635
host_arch : ${{ inputs.build_arch }}
1630
1636
components : ' Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -2029,6 +2035,7 @@ jobs:
2029
2035
path : ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
2030
2036
2031
2037
- name : Download Compilers
2038
+ if : matrix.os != 'Android' || inputs.build_android
2032
2039
uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
2033
2040
with :
2034
2041
name : compilers-Windows-${{ inputs.build_arch }}
@@ -2039,6 +2046,7 @@ jobs:
2039
2046
name : stdlib-${{ matrix.os }}-${{ matrix.arch }}
2040
2047
path : ${{ github.workspace }}/BinaryCache/Library
2041
2048
- uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
2049
+ if : matrix.os != 'Android' || inputs.build_android
2042
2050
with :
2043
2051
name : stdlib-Windows-${{ inputs.build_arch }}
2044
2052
path : ${{ github.workspace }}/BinaryCache/Library
@@ -2048,53 +2056,63 @@ jobs:
2048
2056
name : windows-vfs-overlay-${{ matrix.arch }}
2049
2057
path : ${{ github.workspace }}/BinaryCache/swift/stdlib
2050
2058
- uses : actions/download-artifact@v4
2059
+ if : matrix.os != 'Android' || inputs.build_android
2051
2060
with :
2052
2061
name : macros-${{ inputs.build_arch }}
2053
2062
path : ${{ github.workspace }}/BinaryCache/Library
2054
2063
- uses : actions/checkout@v4
2064
+ if : matrix.os != 'Android' || inputs.build_android
2055
2065
with :
2056
2066
repository : apple/swift-corelibs-libdispatch
2057
2067
ref : ${{ inputs.swift_corelibs_libdispatch_revision }}
2058
2068
path : ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
2059
2069
show-progress : false
2060
2070
- uses : actions/checkout@v4
2071
+ if : matrix.os != 'Android' || inputs.build_android
2061
2072
with :
2062
2073
repository : apple/swift-corelibs-foundation
2063
2074
ref : ${{ inputs.swift_corelibs_foundation_revision }}
2064
2075
path : ${{ github.workspace }}/SourceCache/swift-corelibs-foundation
2065
2076
show-progress : false
2066
2077
- uses : actions/checkout@v4
2078
+ if : matrix.os != 'Android' || inputs.build_android
2067
2079
with :
2068
2080
repository : apple/swift-foundation
2069
2081
ref : ${{ inputs.swift_foundation_revision }}
2070
2082
path : ${{ github.workspace }}/SourceCache/swift-foundation
2071
2083
show-progress : false
2072
2084
- uses : actions/checkout@v4
2085
+ if : matrix.os != 'Android' || inputs.build_android
2073
2086
with :
2074
2087
repository : apple/swift-foundation-icu
2075
2088
ref : ${{ inputs.swift_foundation_icu_revision }}
2076
2089
path : ${{ github.workspace }}/SourceCache/swift-foundation-icu
2077
2090
show-progress : false
2078
2091
- uses : actions/checkout@v4
2092
+ if : matrix.os != 'Android' || inputs.build_android
2079
2093
with :
2080
2094
repository : apple/swift-collections
2081
2095
ref : ${{ inputs.swift_collections_revision }}
2082
2096
path : ${{ github.workspace }}/SourceCache/swift-collections
2083
2097
show-progress : false
2084
2098
- uses : actions/checkout@v4
2099
+ if : matrix.os != 'Android' || inputs.build_android
2085
2100
with :
2086
2101
repository : swiftlang/swift-corelibs-xctest
2087
2102
ref : ${{ inputs.swift_corelibs_xctest_revision }}
2088
2103
path : ${{ github.workspace }}/SourceCache/swift-corelibs-xctest
2089
2104
show-progress : false
2090
2105
- uses : actions/checkout@v4
2106
+ if : matrix.os != 'Android' || inputs.build_android
2091
2107
with :
2092
2108
repository : swiftlang/swift-testing
2093
2109
ref : ${{ inputs.swift_testing_revision }}
2094
2110
path : ${{ github.workspace }}/SourceCache/swift-testing
2095
2111
show-progress : false
2096
2112
2097
- - run : |
2113
+ - name : Setup environment
2114
+ if : matrix.os != 'Android' || inputs.build_android
2115
+ run : |
2098
2116
$RTLPath = cygpath -w ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/bin
2099
2117
echo ${RTLPath} | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
2100
2118
@@ -2103,13 +2121,15 @@ jobs:
2103
2121
2104
2122
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
2105
2123
- uses : compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
2124
+ if : matrix.os != 'Android' || inputs.build_android
2106
2125
with :
2107
2126
host_arch : ${{ inputs.build_arch }}
2108
2127
components : ' Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
2109
2128
arch : ${{ matrix.arch }}
2110
2129
2111
2130
# FIXME(compnerd): workaround CMake 3.29-3.30 issue
2112
2131
- uses : lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main
2132
+ if : matrix.os != 'Android' || inputs.build_android
2113
2133
with :
2114
2134
cmakeVersion : 3.28.6
2115
2135
@@ -2430,7 +2450,9 @@ jobs:
2430
2450
# runtime.
2431
2451
plistlib.dump({ 'DefaultProperties': { 'DEFAULT_USE_RUNTIME': 'MD' } }, plist)
2432
2452
2433
- - run : |
2453
+ - name : Create SDKSettings.json
2454
+ if : matrix.os != 'Android' || inputs.build_android
2455
+ run : |
2434
2456
$SDKSettings = @{
2435
2457
CanonicalName = "${{ matrix.triple }}"
2436
2458
DisplayName = "${{ matrix.os }}"
0 commit comments