Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
with:
distribution: 'temurin'
java-version: '21'
- uses: gradle/actions/setup-gradle@v6
- name: Build with Gradle
run: ./gradlew build
- name: Upload Release Assets
Expand Down Expand Up @@ -77,8 +78,9 @@ jobs:
with:
distribution: 'temurin'
java-version: '21'
- uses: gradle/actions/setup-gradle@v6
- name: Build with Gradle
run: ./gradlew build
run: ./gradlew build --max-workers=2
- name: Upload coverage to Teamscale
if: always() && github.event_name == 'push'
uses: cqse/teamscale-upload-action@v9.2.1
Expand Down
1 change: 1 addition & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repositories {
dependencies {
implementation(plugin(libs.plugins.shadow))
implementation(plugin(libs.plugins.kotlinJvm))
implementation(plugin(libs.plugins.testRetry))

implementation(libs.asm.core)
implementation(libs.asm.commons)
Expand Down
12 changes: 12 additions & 0 deletions buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.internal.os.OperatingSystem

plugins {
java
id("org.gradle.test-retry")
}

group = "com.teamscale"
Expand All @@ -26,6 +28,16 @@ tasks.test {
excludeEngines("teamscale-test-impacted")
}
testLogging.exceptionFormat = TestExceptionFormat.FULL
if (OperatingSystem.current().isWindows) {
maxHeapSize = "1g"
}
if (System.getenv("CI") == "true") {
retry {
maxRetries = 2
maxFailures = 5
failOnPassedAfterRetry = false
}
}
}

// Workaround until https://github.com/gradle/gradle/issues/15383 is fixed
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ shadow = { id = "com.gradleup.shadow", version = "9.4.1" }
oci = { id = "io.github.sgtsilvio.gradle.oci", version = "0.27.0" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version = "2.3.21" }
jlink = { id = "org.beryx.jlink", version = "4.0.0" }
testRetry = { id = "org.gradle.test-retry", version = "1.6.2" }
3 changes: 1 addition & 2 deletions teamscale-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import org.gradle.plugin.compatibility.compatibility
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`java-gradle-plugin`
Expand All @@ -16,7 +15,7 @@ tasks.compileJava {
options.release = 11
}

tasks.withType<KotlinCompile> {
tasks.compileKotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
// Needed to support older Gradle versions
Expand Down
Loading