Skip to content

Commit 699077c

Browse files
authored
build: Use the configure action in the sdk job (#1011)
1 parent 62b9de1 commit 699077c

File tree

2 files changed

+128
-364
lines changed

2 files changed

+128
-364
lines changed

.github/actions/configure-cmake-project/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ runs:
405405
Add-KeyValueIfNew $Defines SWIFT_ANDROID_NDK_PATH "$AndroidNDKPath"
406406
407407
$SWIFTC = if ($UseBuiltCompilers.Contains("Swift")) {
408-
$SWIFTC = "${Env:GITHUB_WORKSPACE}/BinaryCache/Library/Developer/Toolchains/${SwiftVersion}+Asserts/usr/bin/swiftc.exe"
408+
"${Env:GITHUB_WORKSPACE}/BinaryCache/Library/Developer/Toolchains/${SwiftVersion}+Asserts/usr/bin/swiftc.exe"
409409
} else {
410410
# The pinned toolchain is already in the path.
411411
"swiftc.exe"
@@ -461,7 +461,8 @@ runs:
461461
}
462462
}
463463
464-
if ($EnableCaching) {
464+
# TODO(steelskin): sccache does not work with "-gsplit-dwarf".
465+
if ($EnableCaching -and $OS -ne "Android") {
465466
if ($UseC) {
466467
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER_LAUNCHER "sccache"
467468
}

0 commit comments

Comments
 (0)