Skip to content

Commit 3f52be8

Browse files
authored
Skip more steps if Android is disabled (#906)
1 parent 4adf1ed commit 3f52be8

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,37 +1579,42 @@ jobs:
15791579

15801580
steps:
15811581
- name: Download Compilers
1582+
if: matrix.os != 'Android' || inputs.build_android
15821583
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
15831584
with:
15841585
name: compilers-${{ inputs.build_os }}-${{ inputs.build_arch }}
15851586
path: ${{ github.workspace }}/BinaryCache/Library
15861587
- uses: actions/checkout@v4
1588+
if: matrix.os != 'Android' || inputs.build_android
15871589
with:
15881590
repository: swiftlang/llvm-project
15891591
ref: ${{ inputs.llvm_project_revision }}
15901592
path: ${{ github.workspace }}/SourceCache/llvm-project
15911593
show-progress: false
15921594
- uses: actions/checkout@v4
1595+
if: matrix.os != 'Android' || inputs.build_android
15931596
with:
15941597
repository: swiftlang/swift
15951598
ref: ${{ inputs.swift_revision }}
15961599
path: ${{ github.workspace }}/SourceCache/swift
15971600
show-progress: false
15981601
- uses: actions/checkout@v4
1602+
if: matrix.os != 'Android' || inputs.build_android
15991603
with:
16001604
repository: apple/swift-corelibs-libdispatch
16011605
ref: ${{ inputs.swift_corelibs_libdispatch_revision }}
16021606
path: ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
16031607
show-progress: false
16041608
- uses: actions/checkout@v4
1609+
if: matrix.os != 'Android' || inputs.build_android
16051610
with:
16061611
repository: swiftlang/swift-experimental-string-processing
16071612
ref: ${{ inputs.swift_experimental_string_processing_revision }}
16081613
path: ${{ github.workspace }}/SourceCache/swift-experimental-string-processing
16091614
show-progress: false
16101615

16111616
- name: Install Swift Toolchain
1612-
if: inputs.build_os == 'Windows'
1617+
if: inputs.build_os == 'Windows' && (matrix.os != 'Android' || inputs.build_android)
16131618
uses: compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
16141619
with:
16151620
github-repo: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
@@ -1625,6 +1630,7 @@ jobs:
16251630

16261631
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
16271632
- uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
1633+
if: matrix.os != 'Android' || inputs.build_android
16281634
with:
16291635
host_arch: ${{ inputs.build_arch }}
16301636
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
@@ -2029,6 +2035,7 @@ jobs:
20292035
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
20302036

20312037
- name: Download Compilers
2038+
if: matrix.os != 'Android' || inputs.build_android
20322039
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
20332040
with:
20342041
name: compilers-Windows-${{ inputs.build_arch }}
@@ -2039,6 +2046,7 @@ jobs:
20392046
name: stdlib-${{ matrix.os }}-${{ matrix.arch }}
20402047
path: ${{ github.workspace }}/BinaryCache/Library
20412048
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
2049+
if: matrix.os != 'Android' || inputs.build_android
20422050
with:
20432051
name: stdlib-Windows-${{ inputs.build_arch }}
20442052
path: ${{ github.workspace }}/BinaryCache/Library
@@ -2048,53 +2056,63 @@ jobs:
20482056
name: windows-vfs-overlay-${{ matrix.arch }}
20492057
path: ${{ github.workspace }}/BinaryCache/swift/stdlib
20502058
- uses: actions/download-artifact@v4
2059+
if: matrix.os != 'Android' || inputs.build_android
20512060
with:
20522061
name: macros-${{ inputs.build_arch }}
20532062
path: ${{ github.workspace }}/BinaryCache/Library
20542063
- uses: actions/checkout@v4
2064+
if: matrix.os != 'Android' || inputs.build_android
20552065
with:
20562066
repository: apple/swift-corelibs-libdispatch
20572067
ref: ${{ inputs.swift_corelibs_libdispatch_revision }}
20582068
path: ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
20592069
show-progress: false
20602070
- uses: actions/checkout@v4
2071+
if: matrix.os != 'Android' || inputs.build_android
20612072
with:
20622073
repository: apple/swift-corelibs-foundation
20632074
ref: ${{ inputs.swift_corelibs_foundation_revision }}
20642075
path: ${{ github.workspace }}/SourceCache/swift-corelibs-foundation
20652076
show-progress: false
20662077
- uses: actions/checkout@v4
2078+
if: matrix.os != 'Android' || inputs.build_android
20672079
with:
20682080
repository: apple/swift-foundation
20692081
ref: ${{ inputs.swift_foundation_revision }}
20702082
path: ${{ github.workspace }}/SourceCache/swift-foundation
20712083
show-progress: false
20722084
- uses: actions/checkout@v4
2085+
if: matrix.os != 'Android' || inputs.build_android
20732086
with:
20742087
repository: apple/swift-foundation-icu
20752088
ref: ${{ inputs.swift_foundation_icu_revision }}
20762089
path: ${{ github.workspace }}/SourceCache/swift-foundation-icu
20772090
show-progress: false
20782091
- uses: actions/checkout@v4
2092+
if: matrix.os != 'Android' || inputs.build_android
20792093
with:
20802094
repository: apple/swift-collections
20812095
ref: ${{ inputs.swift_collections_revision }}
20822096
path: ${{ github.workspace }}/SourceCache/swift-collections
20832097
show-progress: false
20842098
- uses: actions/checkout@v4
2099+
if: matrix.os != 'Android' || inputs.build_android
20852100
with:
20862101
repository: swiftlang/swift-corelibs-xctest
20872102
ref: ${{ inputs.swift_corelibs_xctest_revision }}
20882103
path: ${{ github.workspace }}/SourceCache/swift-corelibs-xctest
20892104
show-progress: false
20902105
- uses: actions/checkout@v4
2106+
if: matrix.os != 'Android' || inputs.build_android
20912107
with:
20922108
repository: swiftlang/swift-testing
20932109
ref: ${{ inputs.swift_testing_revision }}
20942110
path: ${{ github.workspace }}/SourceCache/swift-testing
20952111
show-progress: false
20962112

2097-
- run: |
2113+
- name: Setup environment
2114+
if: matrix.os != 'Android' || inputs.build_android
2115+
run: |
20982116
$RTLPath = cygpath -w ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/bin
20992117
echo ${RTLPath} | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
21002118
@@ -2103,13 +2121,15 @@ jobs:
21032121
21042122
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
21052123
- uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
2124+
if: matrix.os != 'Android' || inputs.build_android
21062125
with:
21072126
host_arch: ${{ inputs.build_arch }}
21082127
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
21092128
arch: ${{ matrix.arch }}
21102129

21112130
# FIXME(compnerd): workaround CMake 3.29-3.30 issue
21122131
- uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main
2132+
if: matrix.os != 'Android' || inputs.build_android
21132133
with:
21142134
cmakeVersion: 3.28.6
21152135

@@ -2430,7 +2450,9 @@ jobs:
24302450
# runtime.
24312451
plistlib.dump({ 'DefaultProperties': { 'DEFAULT_USE_RUNTIME': 'MD' } }, plist)
24322452
2433-
- run: |
2453+
- name: Create SDKSettings.json
2454+
if: matrix.os != 'Android' || inputs.build_android
2455+
run: |
24342456
$SDKSettings = @{
24352457
CanonicalName = "${{ matrix.triple }}"
24362458
DisplayName = "${{ matrix.os }}"

0 commit comments

Comments
 (0)