Default Versioncreator "VERSION_WITH_BRANCH" changes Release-Version name

[sforberger]

I am not sure if my problem is a bug.

With Version 1.18.0 the default versionCreator changes from simple to VERSION_WITH_BRANCH.

gradle currentVersion on mainbranch is still 1.2.0-SNAPSHOT

Gradle release creates the Tag v1.2.0.
But the gitlab-ci pipeline running on the tagged version, publishs Version 1.2.0-v1.2.0 to maven repository.

It looks like the decorate step is now also being executed for a release

With
scmVersion { versionCreator("simple") }
it works as expected.

[bgalek]

hi!
Can you make sure that on gitlab-ci you checkout on branch not tag? it seems like 1.2.0-v1.2.0 is just {version}-{tag}

[sforberger]

Hi,
git strategy is set to git fetch.
I am using Axion to create the Release-Tag.

[bgalek]

could you add "git status" command before release step and show me your build output?

[sforberger]

$ git status
HEAD detached at 94bcecc
nothing to commit, working tree clean
$ gradle currentVersion
To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/8.9/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation.
Daemon will be stopped at the end of the build 
> Task :buildSrc:checkKotlinGradlePluginConfigurationErrors
> Task :buildSrc:generateExternalPluginSpecBuilders UP-TO-DATE
> Task :buildSrc:extractPrecompiledScriptPluginPlugins UP-TO-DATE
> Task :buildSrc:compilePluginsBlocks UP-TO-DATE
> Task :buildSrc:generatePrecompiledScriptPluginAccessors UP-TO-DATE
> Task :buildSrc:generateScriptPluginAdapters UP-TO-DATE
> Task :buildSrc:compileKotlin UP-TO-DATE
> Task :buildSrc:compileJava NO-SOURCE
> Task :buildSrc:compileGroovy NO-SOURCE
> Task :buildSrc:pluginDescriptors UP-TO-DATE
> Task :buildSrc:processResources UP-TO-DATE
> Task :buildSrc:classes UP-TO-DATE
> Task :buildSrc:jar UP-TO-DATE
> Task :conventions-plugin:currentVersion
Project version: 1.20.0-v1.20.0

[bgalek]

I see HEAD detached at 94bcecc

So as stated in docs:

Since Gitlab will do a detached head checkout, the branch name has to be overridden when versionWithBranch is used.

So just add -Prelease.overriddenBranchName=${CI_COMMIT_REF_SLUG} to your release step and you'll be ready to go ;)

First class gitlab support PR would be appreciated!
So users won't need to add this ;)

You can check @radoslaw-panuszewski PR as inspiration #776

[sforberger]

I have the overridden branch name in the local gradle.properties

echo "release.overriddenBranchName=$CI_COMMIT_REF_NAME" >> $GRADLE_USER_HOME/gradle.properties

CI_COMMIT_REF_NAME='v1.20.0'

[bgalek]

if CI_COMMIT_REF_NAME='v1.20.0' than the version resolved will be 1.2.0-v1.2.0
if CI_COMMIT_REF_NAME will be master or main this version won't be suffixed with branchname

[sforberger]

I switched to CI_COMMIT_REF_SLUG and it's still the same.

[bgalek]

maybe you could share your whole pipeline file?

[sforberger]

cipipeline.txt
Ci-Pipeline Definition as File

[bgalek]

I've tested gitlab-ci integration, and it works fine, I recommend using the release command just like in the docs or this repo:
https://gitlab.com/bgalek/axion-test/-/blob/master/.gitlab-ci.yml?ref_type=heads
https://gitlab.com/bgalek/axion-test/-/jobs/7512709274
https://gitlab.com/bgalek/axion-test/-/tags
(ofc you need to adjust it for your needs)