diff --git a/CHANGELOG.md b/CHANGELOG.md index c577df9a..b9c93096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # NVIDIA Container Toolkit Changelog +## v1.16.0-rc.2 +- Use relative path to locate driver libraries +- Add RelativeToRoot function to Driver +- Inject additional libraries for full X11 functionality +- Extract options from default runtime if runc does not exist +- Avoid using map pointers as maps are always passed by reference +- Reduce logging for the NVIDIA Container runtime +- Fix bug in argument parsing for logger creation + ## v1.16.0-rc.1 - Support vulkan ICD files directly in a driver root. This allows for the discovery of vulkan files in GKE driver installations. diff --git a/hack/generate-changelog.sh b/hack/generate-changelog.sh index 8324350c..32d1ce38 100755 --- a/hack/generate-changelog.sh +++ b/hack/generate-changelog.sh @@ -30,7 +30,12 @@ Options: EOF } -VERSION="" +LIB_VERSION=$(awk -F= '/^LIB_VERSION/ { print $2 }' versions.mk | tr -d '[:space:]') +LIB_TAG=$(awk -F= '/^LIB_TAG/ { print $2 }' versions.mk | tr -d '[:space:]') + +VERSION="v${LIB_VERSION}${LIB_TAG+-${LIB_TAG}}" +>&2 echo "VERSION=$VERSION" + REFERENCE= # Parse command line options @@ -74,9 +79,9 @@ fi >&2 echo "Using ${REFERENCE} as previous version" # Print the changelog -echo "## Changelog" +echo "# Changelog" echo "" -echo "### Version $VERSION" +echo "## $VERSION" # Iterate over the commit messages and ignore the ones that start with "Merge" or "Bump" git log --pretty=format:"%s" $REFERENCE..@ | grep -Ev "(^Merge )|(^Bump)|(no-rel-?note)|(^---)" | sed 's/^\(.*\)/- \1/g' diff --git a/hack/prepare-release.sh b/hack/prepare-release.sh index c4aaf4f2..b52dbe08 100755 --- a/hack/prepare-release.sh +++ b/hack/prepare-release.sh @@ -165,8 +165,11 @@ echo "Creating a version bump branch: bump-release-${release}" git checkout -f -b bump-release-${release} # Patch versions.mk +LIB_VERSION=${${release%-*}#v} +LIB_TAG=${release#*-} echo Patching versions.mk to refer to $release -$SED -i "s/^VERSION.*$/VERSION ?= $release/" versions.mk +$SED -i "s/^LIB_VERSION.*$/LIB_VERSION := $LIB_VERSION/" versions.mk +$SED -i "s/^LIB_TAG.*$/LIB_TAG := $LIB_TAG/" versions.mk git add versions.mk git commit -s -m "Bump version for $release release" diff --git a/versions.mk b/versions.mk index 0bb7ce96..fc66b9ed 100644 --- a/versions.mk +++ b/versions.mk @@ -14,7 +14,7 @@ LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.16.0 -LIB_TAG := rc.1 +LIB_TAG := rc.2 # The package version is the combination of the library version and tag. # If the tag is specified the two components are joined with a tilde (~).