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: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ jobs:
- name: Push Docker Image to DockerHub
if: startsWith(github.ref, 'refs/tags/v')
run: |
./gradlew :agent:pushOciImage --registry=dockerHub :agent:pushLegacyOciImage --registry=dockerHub
./gradlew :agent:pushOciImage --registry=dockerHub :agent:pushLegacyOciImage --registry=dockerHub -PociImageTag=latest
./gradlew :agent:pushOciImage --registry=dockerHub
./gradlew :agent:pushOciImage --registry=dockerHub -PociImageTag=latest
env:
ORG_GRADLE_PROJECT_dockerHubUsername: ${{ secrets.DOCKERHUB_USER }}
ORG_GRADLE_PROJECT_dockerHubPassword: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ We use [semantic versioning](http://semver.org/):
- PATCH version when you make backwards compatible bug fixes.

# Next version
- [breaking] _agent_: The deprecated Docker image `cqse/teamscale-jacoco-agent` is no longer published. Use `cqse/teamscale-java-profiler` instead, which has replaced it since version 36.5.0.
- [fix] _teamscale-gradle-plugin_: `jacoco.includeNoLocationClasses` and `jacoco.excludeClassLoaders` on a test task now reach the profiler. Previously the plugin dropped both, so neither had any effect on which classes the profiler instruments.
- [fix] _teamscale-jacoco-agent_: The profiler no longer aborts the JVM during startup under a class loader that records no local file for its own JAR, such as IntelliJ's `PathClassLoader`. It falls back to the JAR named by the `-javaagent` argument.
- [fix] _impacted-test-engine_: Tests in a `@ParameterizedClass` are now collected.
Expand Down
17 changes: 3 additions & 14 deletions agent/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.github.sgtsilvio.gradle.oci.dsl.OciImageDefinition

plugins {
com.teamscale.`kotlin-convention`
com.teamscale.`java-convention`
Expand Down Expand Up @@ -138,9 +136,9 @@ tasks.shadowDistZip {
}

oci {
val ociImageTag = providers.gradleProperty("ociImageTag").orElse(appVersion)
val configureImage: Action<OciImageDefinition> = Action {
imageTag = ociImageTag
imageDefinitions.register("main") {
imageName = "cqse/teamscale-java-profiler"
imageTag = providers.gradleProperty("ociImageTag").orElse(appVersion)
allPlatforms {
dependencies {
runtime("library:alpine:latest")
Expand All @@ -166,13 +164,4 @@ oci {
specificPlatform(platform("linux", "amd64"))
specificPlatform(platform("linux", "arm64"))
}

imageDefinitions.register("main") {
imageName = "cqse/teamscale-java-profiler"
configureImage.execute(this)
}
imageDefinitions.register("legacy") {
imageName = "cqse/teamscale-jacoco-agent"
configureImage.execute(this)
}
}
Loading