Merge branch 'bump-version' into 'master'

Bump version post v1.6.0-rc.2 release

See merge request nvidia/container-toolkit/container-toolkit!73
This commit is contained in:
Evan Lezar 2021-11-15 13:28:22 +00:00
commit 7d4a8200eb
5 changed files with 14 additions and 5 deletions

View File

@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist
LIB_NAME := nvidia-container-toolkit LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.6.0 LIB_VERSION := 1.6.0
LIB_TAG ?= rc.2 LIB_TAG ?= rc.3
GOLANG_VERSION := 1.16.3 GOLANG_VERSION := 1.16.3
MODULE := github.com/NVIDIA/nvidia-container-toolkit MODULE := github.com/NVIDIA/nvidia-container-toolkit

View File

@ -21,7 +21,7 @@ DIST_DIR ?= $(CURDIR)/dist
# TODO: These should be defined ONCE and currently duplicate the version in the # TODO: These should be defined ONCE and currently duplicate the version in the
# toolkit makefile. # toolkit makefile.
LIB_VERSION := 1.6.0 LIB_VERSION := 1.6.0
LIB_TAG := rc.2 LIB_TAG := rc.3
VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))

View File

@ -1,8 +1,14 @@
nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium
* Move OCI and command line checks for runtime to internal oci package
-- NVIDIA CORPORATION <cudatools@nvidia.com> Mon, 15 Nov 2021 13:02:23 +0100
nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium
* Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
-- NVIDIA CORPORATION <cudatools@nvidia.com> Tue, 26 Oct 2021 12:24:05 +0200 -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 05 Nov 2021 12:24:05 +0200
nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium

View File

@ -64,8 +64,11 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
%changelog %changelog
* Mon Nov 15 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.3
* Tue Oct 26 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2 - Move OCI and command line checks for runtime to internal oci package
* Fri Nov 05 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2
- Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime - Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime

@ -1 +1 @@
Subproject commit badec1fa4a2c085aa9396f95b6bb1d69f1c7996b Subproject commit 3bca465e82ce5843e6b4428596c00ee0c3db7696