Skip to content

Commit d430faa

Browse files
jveihelmannjveihelmann
authored
Merge pull request #686 from cqse/ts/42362_docker_snapshot
TS-42362 Fix wrong version number in docker container
2 parents 4e45e85 + eef2027 commit d430faa

3 files changed

Lines changed: 98 additions & 89 deletions

File tree

‎.github/workflows/actions.yml‎

Lines changed: 91 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -12,100 +12,103 @@ jobs:
1212
name: Build on Linux & Deploy
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-java@v4
17-
with:
18-
distribution: 'temurin'
19-
java-version: '21'
20-
- name: Build with Gradle
21-
run: ./gradlew build
22-
- name: Upload Release Assets
23-
if: startsWith(github.ref, 'refs/tags/v')
24-
uses: svenstaro/upload-release-action@v2
25-
with:
26-
repo_token: ${{ secrets.GITHUB_TOKEN }}
27-
tag: ${{ github.ref }}
28-
file: '{agent/build/distributions/teamscale-jacoco-agent.zip,javaws-wrapper/build/distributions/javaws.zip}'
29-
file_glob: true
30-
overwrite: true
31-
- name: Publish to Gradle Plugin Portal
32-
if: startsWith(github.ref, 'refs/tags/v')
33-
run: |
34-
./gradlew publishPlugins \
35-
-Psigning.secretKeyRingFile=${{ github.workspace }}/.gnupg/secring.gpg \
36-
-Psigning.password=${{ secrets.MAVEN_CENTRAL_GPG_SIGNATURE }} \
37-
-Psigning.keyId=4FB80B8E \
38-
-Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} \
39-
-Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
40-
- name: Publish to Maven Central
41-
if: startsWith(github.ref, 'refs/tags/v')
42-
run: |
43-
./gradlew publishMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository \
44-
-Psigning.secretKeyRingFile=${{ github.workspace }}/.gnupg/secring.gpg \
45-
-PgpgDirectory=${{ github.workspace }}/.gnupg \
46-
-Psigning.password=${{ secrets.MAVEN_CENTRAL_GPG_SIGNATURE }} \
47-
-Psigning.keyId=4FB80B8E \
48-
-PsonatypeUsername=${{ secrets.SONATYPE_USER }} \
49-
-PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
50-
- name: Upload coverage to Teamscale
51-
if: always() && github.event_name == 'push'
52-
uses: cqse/teamscale-upload-action@v9.2.1
53-
with:
54-
server: 'https://cqse.teamscale.io'
55-
project: 'teamscale-jacoco-agent'
56-
user: ${{ secrets.CQSE_TEAMSCALE_IO_USER }}
57-
accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
58-
partition: 'Coverage'
59-
format: 'JACOCO'
60-
message: 'Linux Coverage'
61-
files: '**/jacocoTestReport.xml'
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-java@v4
17+
with:
18+
distribution: 'temurin'
19+
java-version: '21'
20+
- name: Build with Gradle
21+
run: ./gradlew build
22+
- name: Upload Release Assets
23+
if: startsWith(github.ref, 'refs/tags/v')
24+
uses: svenstaro/upload-release-action@v2
25+
with:
26+
repo_token: ${{ secrets.GITHUB_TOKEN }}
27+
tag: ${{ github.ref }}
28+
file: '{agent/build/distributions/teamscale-jacoco-agent.zip,javaws-wrapper/build/distributions/javaws.zip}'
29+
file_glob: true
30+
overwrite: true
31+
- name: Publish to Gradle Plugin Portal
32+
if: startsWith(github.ref, 'refs/tags/v')
33+
run: |
34+
./gradlew publishPlugins \
35+
-Psigning.secretKeyRingFile=${{ github.workspace }}/.gnupg/secring.gpg \
36+
-Psigning.password=${{ secrets.MAVEN_CENTRAL_GPG_SIGNATURE }} \
37+
-Psigning.keyId=4FB80B8E \
38+
-Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} \
39+
-Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
40+
- name: Publish to Maven Central
41+
if: startsWith(github.ref, 'refs/tags/v')
42+
run: |
43+
./gradlew publishMavenPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository \
44+
-Psigning.secretKeyRingFile=${{ github.workspace }}/.gnupg/secring.gpg \
45+
-PgpgDirectory=${{ github.workspace }}/.gnupg \
46+
-Psigning.password=${{ secrets.MAVEN_CENTRAL_GPG_SIGNATURE }} \
47+
-Psigning.keyId=4FB80B8E \
48+
-PsonatypeUsername=${{ secrets.SONATYPE_USER }} \
49+
-PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
50+
- name: Upload coverage to Teamscale
51+
if: always() && github.event_name == 'push'
52+
uses: cqse/teamscale-upload-action@v9.2.1
53+
with:
54+
server: 'https://cqse.teamscale.io'
55+
project: 'teamscale-jacoco-agent'
56+
user: ${{ secrets.CQSE_TEAMSCALE_IO_USER }}
57+
accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
58+
partition: 'Coverage'
59+
format: 'JACOCO'
60+
message: 'Linux Coverage'
61+
files: '**/jacocoTestReport.xml'
6262

6363
test-windows:
6464
name: Test on Windows
6565
runs-on: windows-latest
6666
steps:
67-
- uses: actions/checkout@v4
68-
- uses: actions/setup-java@v4
69-
with:
70-
distribution: 'temurin'
71-
java-version: '21'
72-
- name: Build with Gradle
73-
run: ./gradlew build
74-
- name: Upload coverage to Teamscale
75-
if: always() && github.event_name == 'push'
76-
uses: cqse/teamscale-upload-action@v9.2.1
77-
with:
78-
server: 'https://cqse.teamscale.io'
79-
project: 'teamscale-jacoco-agent'
80-
user: ${{ secrets.CQSE_TEAMSCALE_IO_USER }}
81-
accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
82-
partition: 'Coverage Windows'
83-
format: 'JACOCO'
84-
message: 'Coverage Windows'
85-
files: '**/jacocoTestReport.xml'
67+
- uses: actions/checkout@v4
68+
- uses: actions/setup-java@v4
69+
with:
70+
distribution: 'temurin'
71+
java-version: '21'
72+
- name: Build with Gradle
73+
run: ./gradlew build
74+
- name: Upload coverage to Teamscale
75+
if: always() && github.event_name == 'push'
76+
uses: cqse/teamscale-upload-action@v9.2.1
77+
with:
78+
server: 'https://cqse.teamscale.io'
79+
project: 'teamscale-jacoco-agent'
80+
user: ${{ secrets.CQSE_TEAMSCALE_IO_USER }}
81+
accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
82+
partition: 'Coverage Windows'
83+
format: 'JACOCO'
84+
message: 'Coverage Windows'
85+
files: '**/jacocoTestReport.xml'
8686

8787
docker:
8888
runs-on: ubuntu-latest
8989
steps:
90-
- name: Set up QEMU
91-
uses: docker/setup-qemu-action@v3
92-
- name: Set up Docker Buildx
93-
uses: docker/setup-buildx-action@v3
94-
- name: Docker meta
95-
id: meta
96-
uses: docker/metadata-action@v5
97-
with:
98-
images: cqse/teamscale-jacoco-agent
99-
- name: Login to DockerHub
100-
if: github.event_name != 'pull_request'
101-
uses: docker/login-action@v3
102-
with:
103-
username: ${{ secrets.DOCKERHUB_USER }}
104-
password: ${{ secrets.DOCKERHUB_TOKEN }}
105-
- name: Build and push
106-
uses: docker/build-push-action@v6
107-
with:
108-
file: 'agent/src/docker/Dockerfile'
109-
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
110-
tags: ${{ steps.meta.outputs.tags }}
111-
labels: ${{ steps.meta.outputs.labels }}
90+
- name: Set up QEMU
91+
uses: docker/setup-qemu-action@v3
92+
- name: Set up Docker Buildx
93+
uses: docker/setup-buildx-action@v3
94+
- name: Docker meta
95+
id: meta
96+
uses: docker/metadata-action@v5
97+
with:
98+
images: cqse/teamscale-jacoco-agent
99+
- name: Login to DockerHub
100+
if: github.event_name != 'pull_request'
101+
uses: docker/login-action@v3
102+
with:
103+
username: ${{ secrets.DOCKERHUB_USER }}
104+
password: ${{ secrets.DOCKERHUB_TOKEN }}
105+
- name: Build and push
106+
uses: docker/build-push-action@v6
107+
with:
108+
file: 'agent/src/docker/Dockerfile'
109+
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
110+
tags: ${{ steps.meta.outputs.tags }}
111+
labels: ${{ steps.meta.outputs.labels }}
112+
build-args: |
113+
GITHUB_REF=${{ github.ref }}
114+

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ We use [semantic versioning](http://semver.org/):
66

77
# Next version
88
- [feature] _agent_: Experimental support for Java 25 class files
9+
- [fix] _agent_: Reported wrong version number in docker container
910

1011
# 35.0.3
1112
- [fix] _teamscale-gradle-plugin_: `IllegalArgumentException`: Can't execute request without discovering it first

‎agent/src/docker/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# --- build image ---
22

33
FROM openjdk:21 AS build
4+
5+
# We need to manually pass this enviroment variable through to make Gradle determine the correct version number (TS-42362)
6+
ARG GITHUB_REF
7+
ENV GITHUB_REF=${GITHUB_REF}
8+
49
# install xargs which is needed during the build
510
RUN microdnf install findutils
611
ADD . /src
@@ -29,4 +34,4 @@ sleep infinity & wait
2934
EOT
3035
RUN chmod +x /entrypoint.sh
3136

32-
CMD ["/entrypoint.sh"]
37+
CMD ["/entrypoint.sh"]

0 commit comments

Comments
 (0)