Skip to content

Commit 1706764

Browse files
committed
Enable gradle daemon with an idle timeout, increment internal timeout
1 parent 431e63e commit 1706764

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
env:
1313
RUN: ${{ github.run_id }}-${{ github.run_number }}
14-
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
14+
GRADLE_OPTS: "-Dorg.gradle.daemon.idletimeout=60000 -Dkotlin.incremental=false"
1515

1616
jobs:
1717
jvm:

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ kotlin.native.ignoreDisabledTargets=true
44

55
# gradle
66
org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2G
7+
8+
# temp debugging properties
79
org.gradle.internal.http.connectionTimeout=120_000
810
org.gradle.internal.http.socketTimeout=120_000
911
org.gradle.internal.https.connectionTimeout=120_000
1012
org.gradle.internal.https.socketTimeout=120_000
13+
org.gradle.internal.timeout=120_000
1114

1215
# sdk
1316
sdkVersion=1.3.18-SNAPSHOT

tests/codegen/smoke-tests/src/test/kotlin/SmokeTestE2ETest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SERVICE_FILTER
33
import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SKIP_TAGS
44
import java.io.ByteArrayOutputStream
55
import java.io.File
6-
import java.net.URI
76
import kotlin.test.*
87

98
class SmokeTestE2ETest {
@@ -46,7 +45,6 @@ private fun runSmokeTests(envVars: Map<String, String> = emptyMap()): String {
4645
val outputStream = ByteArrayOutputStream()
4746
val connector = GradleConnector.newConnector()
4847
.forProjectDirectory(File(sdkRootDir))
49-
.useDistribution(URI("https://services.gradle.org/distributions/gradle-8.5-bin.zip"))
5048
.connect()
5149

5250
try {

0 commit comments

Comments
 (0)