Merge branch 'bump-version-1.11.0' into 'main'

Bump version to 1.11.0 See merge request nvidia/container-toolkit/container-toolkit!213
NVIDIA · Sep 6, 2022 · d9de4a0 · d9de4a0
2 parents 503ed96 + 2dbcda2
commit d9de4a0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # NVIDIA Container Toolkit Changelog
 
+## v1.11.0
+
+* Promote v1.11.0-rc.3 to v1.11.0
+
 ## v1.11.0-rc.3
 
 * Build fedora35 packages

diff --git a/Makefile b/Makefile
@@ -51,6 +51,7 @@ CLI_VERSION = $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))
 else
 CLI_VERSION = $(VERSION)
 endif
+CLI_VERSION_PACKAGE = github.com/NVIDIA/nvidia-container-toolkit/internal/info
 
 GOOS ?= linux
 
@@ -60,7 +61,7 @@ cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*)
 endif
 cmds: $(CMD_TARGETS)
 $(CMD_TARGETS): cmd-%:
-	GOOS=$(GOOS) go build -ldflags "-s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=$(GIT_COMMIT) -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*)
+	GOOS=$(GOOS) go build -ldflags "-s -w -X $(CLI_VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) -X $(CLI_VERSION_PACKAGE).version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*)
 
 build:
 	GOOS=$(GOOS) go build ./...

diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
@@ -78,4 +78,4 @@ RUN dch --create --package="${PKG_NAME}" \
 CMD export DISTRIB="$(lsb_release -cs)" && \
     debuild -eDISTRIB -eSECTION -eLIBNVIDIA_CONTAINER_TOOLS_VERSION -eVERSION="${REVISION}" \
     --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \
-    mv /tmp/nvidia-container-toolkit_*.deb /dist
+    mv /tmp/*.deb /dist
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
diff --git a/versions.mk b/versions.mk
@@ -14,7 +14,7 @@
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.11.0
-LIB_TAG := rc.3
+LIB_TAG :=
 
 # Specify the nvidia-docker2 and nvidia-container-runtime package versions.
 # Note: The tag is automatically specified to match LIB_TAG.
@@ -27,4 +27,4 @@ LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack
 CUDA_VERSION := 11.7.1
 GOLANG_VERSION := 1.17.8
 
-GIT_COMMIT ?= $(shell git describe --dirty --long --always 2> /dev/null || echo "")
+GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always 2> /dev/null || echo "")