From 91ad5af24ca2e9ed6503efcea4074b1f0ef863a4 Mon Sep 17 00:00:00 2001 From: Florian Dreier Date: Thu, 10 Sep 2026 09:28:28 +0200 Subject: [PATCH] TS-46227 Stop publishing the legacy Docker image The deprecation window announced with the rename to cqse/teamscale-java-profiler has passed, so the legacy image cqse/teamscale-jacoco-agent is no longer published. The shared configureImage action only existed to feed both image definitions and is inlined into the remaining one. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/actions.yml | 4 ++-- CHANGELOG.md | 1 + agent/build.gradle.kts | 17 +++-------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 021e9cd7a..7eb769c1b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -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 }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 116614ade..a11bcd0c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/agent/build.gradle.kts b/agent/build.gradle.kts index c1334a8d9..de66ce297 100644 --- a/agent/build.gradle.kts +++ b/agent/build.gradle.kts @@ -1,5 +1,3 @@ -import io.github.sgtsilvio.gradle.oci.dsl.OciImageDefinition - plugins { com.teamscale.`kotlin-convention` com.teamscale.`java-convention` @@ -138,9 +136,9 @@ tasks.shadowDistZip { } oci { - val ociImageTag = providers.gradleProperty("ociImageTag").orElse(appVersion) - val configureImage: Action = Action { - imageTag = ociImageTag + imageDefinitions.register("main") { + imageName = "cqse/teamscale-java-profiler" + imageTag = providers.gradleProperty("ociImageTag").orElse(appVersion) allPlatforms { dependencies { runtime("library:alpine:latest") @@ -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) - } }