diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index e8d22a7364..6c55cf6901 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -205,16 +205,16 @@ jobs: shell: bash run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "$VERSION" - - name: Build and push image - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 - with: - push: true - build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" - context: . - platforms: linux/amd64,linux/arm64 - tags: | - ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} - ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} + # - name: Build and push image + # uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 + # with: + # push: true + # build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" + # context: . + # platforms: linux/amd64,linux/arm64 + # tags: | + # ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} + # ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} - name: Build and Publish release with Gradle uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 #v3.5.0 diff --git a/version.gradle.kts b/version.gradle.kts index 47653c919e..fee416c87f 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -16,9 +16,7 @@ val adotVersion = "2.20.0" allprojects { - version = if (project.hasProperty("release.version")) { - project.property("release.version") as String - } else { - adotVersion + if (!project.hasProperty("release.version")) { + version = adotVersion } }