Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ jobs:
java-version: ${{ env.JAVA }}
distribution: ${{ env.JAVA_DISTRIBUTION }}

- name: Checkout local jacodb
uses: actions/checkout@v4
with:
repository: UnitTestBot/jacodb
ref: lipen/dev
path: jacodb

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

Expand Down Expand Up @@ -51,6 +58,13 @@ jobs:
java-version: ${{ env.JAVA }}
distribution: ${{ env.JAVA_DISTRIBUTION }}

- name: Checkout local jacodb
uses: actions/checkout@v4
with:
repository: UnitTestBot/jacodb
ref: lipen/dev
path: jacodb

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

Expand Down Expand Up @@ -80,6 +94,13 @@ jobs:
java-version: ${{ env.JAVA }}
distribution: ${{ env.JAVA_DISTRIBUTION }}

- name: Checkout local jacodb
uses: actions/checkout@v4
with:
repository: UnitTestBot/jacodb
ref: lipen/dev
path: jacodb

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

Expand Down Expand Up @@ -113,6 +134,13 @@ jobs:
java-version: ${{ env.JAVA }}
distribution: ${{ env.JAVA_DISTRIBUTION }}

- name: Checkout local jacodb
uses: actions/checkout@v4
with:
repository: UnitTestBot/jacodb
ref: lipen/dev
path: jacodb

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

Expand Down Expand Up @@ -174,6 +202,13 @@ jobs:
distribution: temurin
java-version: 21

- name: Checkout local jacodb
uses: actions/checkout@v4
with:
repository: UnitTestBot/jacodb
ref: lipen/dev
path: jacodb

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

Expand Down
32 changes: 16 additions & 16 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ findProject(":usvm-python:usvm-python-runner")?.name = "usvm-python-runner"
include("usvm-python:usvm-python-commons")
findProject(":usvm-python:usvm-python-commons")?.name = "usvm-python-commons"

// Actually, `includeBuild("../jacodb")` is enough, but there is a bug in IDEA when path is a symlink.
// Actually, relative path is enough, but there is a bug in IDEA when the path is a symlink.
// As a workaround, we convert it to a real absolute path.
// See IDEA bug: https://youtrack.jetbrains.com/issue/IDEA-329756
// val jacodbPath = file("jacodb").takeIf { it.exists() }
// ?: file("../jacodb").takeIf { it.exists() }
// ?: error("Local JacoDB directory not found")
// includeBuild(jacodbPath.toPath().toRealPath().toAbsolutePath()) {
// dependencySubstitution {
// all {
// val requested = requested
// if (requested is ModuleComponentSelector && requested.group == "com.github.UnitTestBot.jacodb") {
// val targetProject = ":${requested.module}"
// useTarget(project(targetProject))
// logger.info("Substituting ${requested.group}:${requested.module} with $targetProject")
// }
// }
// }
// }
val jacodbPath = file("jacodb").takeIf { it.exists() }
?: file("../jacodb").takeIf { it.exists() }
?: error("Local JacoDB directory not found")
includeBuild(jacodbPath.toPath().toRealPath().toAbsolutePath()) {
dependencySubstitution {
all {
val requested = requested
if (requested is ModuleComponentSelector && requested.group == "com.github.UnitTestBot.jacodb") {
val targetProject = ":${requested.module}"
useTarget(project(targetProject))
logger.info("Substituting ${requested.group}:${requested.module} with $targetProject")
}
}
}
}
1 change: 1 addition & 0 deletions usvm-ts-dataflow/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {

testFixturesImplementation(Libs.kotlin_logging)
testFixturesImplementation(Libs.junit_jupiter_api)
testFixturesImplementation(Libs.kotlinx_coroutines_core)
}

tasks.withType<Test> {
Expand Down
Loading