Skip to content

Commit a998e67

Browse files
committed
clean up property name
1 parent c96d23e commit a998e67

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
- name: Build and Test ${{ env.PACKAGE_NAME }}
149149
shell: msys2 {0}
150150
run: |
151-
./gradlew build -Paws.sdk.kotlin.crt.disableCrossCompile=mingw_x64
151+
./gradlew build -Paws.crt.disableContainerTargets=mingw_x64
152152
- name: Save Test Reports
153153
if: failure()
154154
uses: actions/upload-artifact@v4

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,14 @@ private val requiresExplicitBash = setOf(
220220
)
221221

222222
private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: List<String>) {
223-
val disableCrossCompile = (project.properties["aws.sdk.kotlin.crt.disableCrossCompile"] as? String ?: "")
223+
val disableContainerTargets = (project.properties["aws.crt.disableContainerTargets"] as? String ?: "")
224224
.split(',')
225225
.map { it.trim() }
226226
.toSet()
227227

228-
val useContainer = target.konanTarget in containerCompileTargets && target.konanTarget.name !in disableCrossCompile
228+
val useContainer =
229+
target.konanTarget in containerCompileTargets &&
230+
target.konanTarget.name !in disableContainerTargets
229231

230232
project.exec {
231233
workingDir(project.rootDir)
@@ -261,8 +263,6 @@ private fun validateCrossCompileScriptsAvailable(project: Project, script: Strin
261263
the cross compile scripts.
262264
263265
e.g. `./docker-images/build-all.sh`
264-
265-
Alternatively disable cross compilation by setting the property `-Paws.sdk.kotlin.crt.disableCrossCompile=true`
266266
""".trimIndent()
267267
error(message)
268268
}

0 commit comments

Comments
 (0)