@@ -138,18 +138,19 @@ else
138138fi
139139
140140# TODO: We need to ensure that this tooling also works on `release-*` branches.
141- if [[ " $FORCE_BRANCH " != " yes" && " $( git rev-parse --abbrev-ref HEAD) " != " main" ]]; then
142- echo " Release scripts should be run on 'main'"
143- exit 1
144- fi
145-
146- git fetch
147- git diff --quiet FETCH_HEAD
148- if [[ $? -ne 0 ]]; then
149- echo " Local changes detected:"
150- git diff FETCH_HEAD | cat
151- echo " Exiting"
152- exit 1
141+ if [[ " $FORCE " != " yes" ]]; then
142+ if [[ " $( git rev-parse --abbrev-ref HEAD) " != " main" ]]; then
143+ echo " Release scripts should be run on 'main'"
144+ exit 1
145+ fi
146+ git fetch
147+ git diff --quiet FETCH_HEAD
148+ if [[ $? -ne 0 ]]; then
149+ echo " Local changes detected:"
150+ git diff FETCH_HEAD | cat
151+ echo " Exiting"
152+ exit 1
153+ fi
153154fi
154155
155156# Create a release issue.
@@ -160,16 +161,21 @@ cat RELEASE.md | sed "s/{{ .VERSION }}/$release/g" | \
160161 --title " Release nvidia-container-toolkit $release " \
161162 --label release
162163
163-
164164echo " Creating a version bump branch: bump-release-${release} "
165165git checkout -f -b bump-release-${release}
166166
167167# Patch versions.mk
168- LIB_VERSION=${${release% -* } # v}
169- LIB_TAG=${release#* -}
168+ LIB_VERSION=${release% -* }
169+ LIB_VERSION=${LIB_VERSION# v}
170+ if [[ ${release} == v* -rc.* ]]; then
171+ LIB_TAG_STRING=" ${release#* -} "
172+ else
173+ LIB_TAG_STRING=
174+ fi
175+
170176echo Patching versions.mk to refer to $release
171177$SED -i " s/^LIB_VERSION.*$/LIB_VERSION := $LIB_VERSION /" versions.mk
172- $SED -i " s/^LIB_TAG.*$/LIB_TAG := $LIB_TAG /" versions.mk
178+ $SED -i " s/^LIB_TAG.*$/LIB_TAG :=$LIB_TAG_STRING /" versions.mk
173179
174180git add versions.mk
175181git commit -s -m " Bump version for $release release"
0 commit comments