Skip to content
Draft
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
2 changes: 2 additions & 0 deletions .github/workflows/build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ jobs:
- 1
- 2
- 3
- 4
- 5
test-indy:
- false
- true
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/reusable-muzzle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
- ":instrumentation:muzzle2"
- ":instrumentation:muzzle3"
- ":instrumentation:muzzle4"
- ":instrumentation:muzzle5"
- ":instrumentation:muzzle6"
fail-fast: false
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
group = "Help"
description = "List test tasks in given partition"

// total of 4 partitions (see modulo 4 below)
// total of 6 partitions (see modulo 6 below)
var testPartition = (project.findProperty("testPartition") as String?)?.toInt()
if (testPartition == null) {
throw GradleException("Test partition must be specified")
} else if (testPartition < 0 || testPartition >= 4) {
} else if (testPartition < 0 || testPartition >= 6) {
throw GradleException("Invalid test partition")
}

Expand All @@ -82,7 +82,7 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
// relying on predictable ordering of subprojects
// (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4)
// since we are splitting these tasks across different github action jobs
val enabled = testPartitionCounter++ % 4 == testPartition
val enabled = testPartitionCounter++ % 6 == testPartition
if (enabled) {
tasks.withType<Test>().configureEach {
partitionTasks.add(this)
Expand Down
6 changes: 4 additions & 2 deletions instrumentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ plugins {

val instrumentationProjectTest = tasks.named("test")

// batching up the muzzle tasks alphabetically into 4 chunks
// batching up the muzzle tasks alphabetically into 6 chunks
// to split them up into separate CI jobs (but not too many CI job)
val instrumentationProjectMuzzle = listOf(
tasks.register("muzzle1"),
tasks.register("muzzle2"),
tasks.register("muzzle3"),
tasks.register("muzzle4"),
tasks.register("muzzle5"),
tasks.register("muzzle6"),
)

var counter = 0
Expand All @@ -33,6 +35,6 @@ subprojects {
// relying on predictable ordering of subprojects
// (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4)
// since we are splitting these muzzleX tasks across different github action jobs
instrumentationProjectMuzzle[counter++ % 4].get().dependsOn(subProj.tasks.named("muzzle"))
instrumentationProjectMuzzle[counter++ % 6].get().dependsOn(subProj.tasks.named("muzzle"))
}
}
Loading