Skip to content

Commit 4814e5c

Browse files
committed
Revert changes
1 parent 3c98f8d commit 4814e5c

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/actions.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
with:
1818
distribution: 'temurin'
1919
java-version: '21'
20-
# - name: Build with Gradle
21-
# run: ./gradlew build
20+
- name: Build with Gradle
21+
run: ./gradlew build
2222
- name: Upload Release Assets
2323
if: startsWith(github.ref, 'refs/tags/v')
2424
uses: svenstaro/upload-release-action@v2
@@ -48,11 +48,10 @@ jobs:
4848
-PsonatypeUsername=${{ secrets.SONATYPE_USER }} \
4949
-PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }}
5050
- name: Push Docker Image to DockerHub
51-
# TODO: uncomment before merging
52-
# if: startsWith(github.ref, 'refs/tags/v')
51+
if: startsWith(github.ref, 'refs/tags/v')
5352
run: |
54-
./gradlew :agent:pushOciImage --registry=dockerHub
55-
./gradlew :agent:pushOciImage --registry=dockerHub -PociImageTag=latest
53+
./gradlew :agent:pushOciImage :agent:pushLegacyOciImage --registry=dockerHub
54+
./gradlew :agent:pushOciImage :agent:pushLegacyOciImage --registry=dockerHub -PociImageTag=latest
5655
env:
5756
ORG_GRADLE_PROJECT_dockerHubUsername: ${{ secrets.DOCKERHUB_USER }}
5857
ORG_GRADLE_PROJECT_dockerHubPassword: ${{ secrets.DOCKERHUB_TOKEN }}

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
group = "com.teamscale"
66

7-
val appVersion by extra("36.4.1-rc1")
7+
val appVersion by extra("36.4.1")
88

9-
val snapshotVersion = appVersion //+ if (VersionUtils.isTaggedRelease()) "" else "-SNAPSHOT"
9+
val snapshotVersion = appVersion + if (VersionUtils.isTaggedRelease()) "" else "-SNAPSHOT"
1010

1111
allprojects {
1212
version = snapshotVersion

0 commit comments

Comments
 (0)