Skip to content

chore: refresh Mac CI targets, enable parallel builds by default #1440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Oct 16, 2025
Merged

chore: refresh Mac CI targets, enable parallel builds by default #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
732b3ae
chore: refresh Mac CI targets
ianbotsf Oct 13, 2025
a8dc88d
experiment: bump memory profile for Kotlin daemon
ianbotsf Oct 13, 2025
ee21fa6
even moar memory
ianbotsf Oct 14, 2025
eaf653d
adjust Gradle daemon memory instead
ianbotsf Oct 14, 2025
12d59f8
chore: parallize all builds by default (#1438)
ianbotsf Oct 13, 2025
672958e
increase test logging output
ianbotsf Oct 14, 2025
aec78d0
fix sed command
ianbotsf Oct 14, 2025
310fa1b
debugging sed command
ianbotsf Oct 14, 2025
3813034
swap order of sed switches
ianbotsf Oct 14, 2025
1e2f873
spaces
ianbotsf Oct 14, 2025
579ebf0
rework sed command to avoid in-place edits
ianbotsf Oct 14, 2025
04b0011
relist directory after upgrading gradle.properties
ianbotsf Oct 14, 2025
2a98454
what is sed even doing?
ianbotsf Oct 14, 2025
8a31355
okay, so sed has to pipe out to a new file and then rename that back …
ianbotsf Oct 14, 2025
27b1917
increase Gradle log level
ianbotsf Oct 15, 2025
181eb7e
remove macOS 14; run multiple instances of macOS 15 CI to verify stab…
ianbotsf Oct 15, 2025
7076c0d
remove debugging steps; drop Gradle INFO-level logs
ianbotsf Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ jobs:
WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds

# macos-14 build and test for targets: jvm, macoArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
# macos-13 build and test for targets: jvm, macoX64, iosX64, tvosX64, watchosX64
# macOS ARM images build and test for targets: jvm, macosArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
# macos x64 images build and test for targets: jvm, macosX64, iosX64, tvosX64, watchosX64
macos:
strategy:
fail-fast: false
matrix:
os: [macos-14, macos-13]
os:
- macos-15-large # x64
- macos-15-xlarge # ARM
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
Expand All @@ -111,6 +113,17 @@ jobs:
working-directory: ./smithy-kotlin
shell: bash
run: |
# Bump memory profile for Kotlin daemon
cat gradle.properties \
| sed -r 's/-Xmx[0-9]+G/-Xmx6G/g' \
| sed -r 's/-XX:MaxMetaspaceSize=[0-9]+G/-XX:MaxMetaspaceSize=2G/g' \
Comment on lines +118 to +119
Copy link
Contributor

@lauzadis lauzadis Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to apply this to our internal release builds?

Copy link
Contributor Author

@ianbotsf ianbotsf Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good point. I'll open up a CR and get it merged before shipping this change.

> gradle.properties2
mv gradle.properties2 gradle.properties

echo "Modified gradle.properties:"
cat gradle.properties
echo ""

# FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
# echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
./gradlew apiCheck
Expand Down Expand Up @@ -369,7 +382,7 @@ jobs:
run: |
# TODO - JVM only
cd $GITHUB_WORKSPACE/smithy-kotlin
./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
./gradlew -Paws.kotlin.native=false publishToMavenLocal
SMITHY_KOTLIN_RUNTIME_VERSION=$(grep sdkVersion= gradle.properties | cut -d = -f 2)
SMITHY_KOTLIN_CODEGEN_VERSION=$(grep codegenVersion= gradle.properties | cut -d = -f 2)
cd $GITHUB_WORKSPACE/aws-sdk-kotlin
Expand All @@ -380,7 +393,7 @@ jobs:
# smithy-kotlin should be
sed -i "s/smithy-kotlin-runtime-version = .*$/smithy-kotlin-runtime-version = \"$SMITHY_KOTLIN_RUNTIME_VERSION\"/" gradle/libs.versions.toml
sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
./gradlew -Paws.kotlin.native=false publishToMavenLocal
./gradlew -Paws.kotlin.native=false test jvmTest
./gradlew -Paws.kotlin.native=false testAllProtocols
- name: Calculate duration
Expand Down
2 changes: 1 addition & 1 deletion builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"build_dir": "target/build",
"build_steps": [
"{gradlew} assemble --parallel"
"{gradlew} assemble"
],
"post_build_steps": [
"{gradlew} publishToMavenLocal"
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false

# gradle
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
org.gradle.parallel=true

# SDK
sdkVersion=1.5.15-SNAPSHOT
Expand All @@ -21,4 +22,4 @@ codegenVersion=0.35.15-SNAPSHOT

# FIXME Remove after Dokka 2.0 Gradle plugin is stable
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
3 changes: 1 addition & 2 deletions runtime/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
import aws.sdk.kotlin.gradle.dsl.configurePublishing
import aws.sdk.kotlin.gradle.kmp.*
import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
import aws.sdk.kotlin.gradle.kmp.kotlin
import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured
Expand Down Expand Up @@ -135,7 +134,7 @@ subprojects {
}

testLogging {
events("passed", "skipped", "failed")
events("passed", "skipped", "failed", "standardOut", "standardError")
showStandardStreams = true
showStackTraces = true
showExceptions = true
Expand Down
Loading