Skip to content

Commit d2575ab

Browse files
author
Evan Lezar
committed
Merge branch 'match-toolkit-tag' into 'master'
Ensure that package tags for components match See merge request nvidia/container-toolkit/container-toolkit!76
2 parents 81f9caa + bc1f6e0 commit d2575ab

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

scripts/get-component-versions.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ if [[ "${libnvidia_container_version_tag}" != "${nvidia_container_toolkit_versio
6060
>&2 echo "WARNING: The libnvidia-container and nvidia-container-toolkit versions do not match"
6161
fi
6262
echo "NVIDIA_CONTAINER_RUNTIME_VERSION=${nvidia_container_runtime_version}"
63+
echo "NVIDIA_CONTAINER_RUNTIME_TAG=${nvidia_container_runtime_tag}"
6364
echo "NVIDIA_DOCKER_VERSION=${nvidia_docker_version}"
65+
echo "NVIDIA_DOCKER_TAG=${nvidia_docker_tag}"

scripts/release.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ eval $(${SCRIPTS_DIR}/get-component-versions.sh)
5656
export NVIDIA_CONTAINER_TOOLKIT_VERSION
5757
export NVIDIA_CONTAINER_TOOLKIT_TAG
5858

59+
if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_CONTAINER_RUNTIME_TAG}" ]]; then
60+
echo "ERROR: The nvidia-container-runtime and nvidia-container-toolkit version tags do not match"
61+
exit 1
62+
fi
63+
64+
if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_DOCKER_TAG}" ]]; then
65+
echo "ERROR: The nvidia-docker and nvidia-container-toolkit version tags do not match"
66+
exit 1
67+
fi
68+
5969
for target in ${targets[@]}; do
6070
${SCRIPTS_DIR}/build-all-components.sh ${target}
6171
done
Submodule nvidia-container-runtime updated from 037ec4c to ba4815e

third_party/nvidia-docker

Submodule nvidia-docker updated from 9de312f to 34934c2

0 commit comments

Comments
 (0)