chore(docker): Use the output of printSemVersion as ORT_VERSION
#7622
Conversation
Previously, the value looked like 3.0.0-SNAPSHOT. Change it to the form like `3.0.0-389da0c-SNAPSHOT`, so that it is possible to figure out from which sources ORT has been built. Signed-off-by: Frank Viernau <[email protected]>
Codecov ReportAll modified lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7622 +/- ##
=========================================
Coverage 68.03% 68.03%
Complexity 2022 2022
=========================================
Files 344 344
Lines 16725 16725
Branches 2371 2371
=========================================
Hits 11379 11379
Misses 4363 4363
Partials 983 983
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
| @@ -169,7 +169,7 @@ jobs: | |||
|
|
|||
| - name: Get ORT current version | |||
| run: | | |||
| ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p") | |||
| ORT_VERSION=$(./gradlew -q printSemVersion) | |||
There was a problem hiding this comment.
Note that when being exactly on tag 2.0.0 (with a clean working tree), this would print 2.0.0+sha.5893bd7 instead of 2.0.0. Is this desired?
There was a problem hiding this comment.
I wasn't aware of that, but I think it's fine. I'd be fine if this logic was improved later on to only print 2.0.0 in that case. Do you agree?
There was a problem hiding this comment.
That would be a mismatch, however, for people running ORT also from the distribution archive, which shows 2.0.0 in this case. I'll look into customizing the version format to address that.
There was a problem hiding this comment.
Shall we merge now this and then customize the version format in that gradle tasks later on?
There was a problem hiding this comment.
My alternative proposal is already here. That could be used instead of this PR (not in addition to it). The advantage is that also non-Docker user would get the SHA1 info for pre-release builds.
There was a problem hiding this comment.
I can minimize it direct in the tagging, i can capture the sha without need to alter the current Gradle process.
But will solve only for the images in upstream, not the local build script/.
|
Close in favor of #7628 . |
Previously, the value looked like 3.0.0-SNAPSHOT. Change it to the form like
3.0.0-389da0c-SNAPSHOT, so that it is possible to figure out from which sources ORT has been built.