Bump version to 1.20.0~dev post-release#1726
Bump version to 1.20.0~dev post-release#1726cdesiniotis wants to merge 2 commits intoNVIDIA:mainfrom
Conversation
| LIB_VERSION := 1.19.0 | ||
| LIB_TAG := | ||
| LIB_VERSION := 1.20.0 | ||
| LIB_TAG := dev |
There was a problem hiding this comment.
As a note. This is what fills up our Shipit view with versions that we don't want to release. Does it make sense to use something like rc.0 here instead so that ordering at least remains consistent?
There was a problem hiding this comment.
Could you clarify how adding rc.0 here would help with the ordering?
There was a problem hiding this comment.
Updated to rc.0 as you suggested.
There was a problem hiding this comment.
To be clear, this could be solved elsewhere in the stack (e.g. where we construct the kitmaker build version), but see the following example:
Note that the 1.19.0~dev releases ALWAYS come before the 1.19.0 releases.
Looking at the how we construct the kitmaker version, we could use dev here and then change the following line https://github.com/elezar/nvidia-container-toolkit/blob/5eee5ce7b8ab19012f5aabdafd525f21b3a54496/scripts/release-kitmaker-artifactory.sh#L196 too:
diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh
index 58ea8a61..0f4780fe 100755
--- a/scripts/release-kitmaker-artifactory.sh
+++ b/scripts/release-kitmaker-artifactory.sh
@@ -193,7 +193,7 @@ function upload_archive() {
component="nvidia_container_toolkit"
version="${VERSION%~rc.*}"
version_suffix=$(date -r "${IMAGE_EPOCH}" '+%Y.%m.%d.%s' || date -d @"${IMAGE_EPOCH}" '+%Y.%m.%d.%s')
-kitmaker_version="${VERSION%~rc.*}.${version_suffix}"
+kitmaker_version="${VERSION%~*}.${version_suffix}"
kitmaker_os="linux"
# create_and_upload creates a kitmaker archive for the specified component, os, and arch and uploads it.
That might be a cleaner long-term change.
There was a problem hiding this comment.
Got it. Your proposal makes sense. I have changed LIB_TAG back to dev to align with what was done previously. I have opened #1764 to hopefully clean up our future builds in ShipIt.
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
21fae8e to
7cda68d
Compare
Coverage Report for CI Build 24370293315Coverage remained the same at 43.4%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
7cda68d to
f6e285a
Compare
No description provided.