diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 90ee13f0..38baf166 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,14 +28,13 @@ jobs: java-version: 17 cache: 'gradle' # FIXME - we will need to migrate this to ECR to avoid throttle limits from dockerhub, for now rebuild the images during CI -# - name: Configure Docker Images -# run: | -# ./docker-images/build-all.sh -# docker images - - name: Build and Test ${{ env.PACKAGE_NAME }} + - name: Configure Docker Images run: | ./docker-images/build-all.sh docker images + - name: Build and Test ${{ env.PACKAGE_NAME }} + run: | + docker images ./gradlew apiCheck ./gradlew allTests diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt index a0f1563c..a78fc740 100644 --- a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt +++ b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt @@ -198,7 +198,8 @@ private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: Li val exeName = when (target.konanTarget) { KonanTarget.LINUX_X64, KonanTarget.LINUX_ARM64 -> { // cross compiling via dockcross - set the docker exe to cmake - exeArgs.add(0, "cmake") + val containerScriptArgs = listOf("--args", "--pull=never", "--", "cmake") + exeArgs.addAll(0, containerScriptArgs) "./dockcross-" + target.konanTarget.name.replace("_", "-") } else -> "cmake"