mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-22 00:08:11 +00:00
Merge branch 'update-release' into 'master'
Add scripting to update component submodules See merge request nvidia/container-toolkit/container-toolkit!97
This commit is contained in:
commit
4562cb559c
@ -51,6 +51,14 @@ else
|
|||||||
targets=${all[@]}
|
targets=${all[@]}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "Updating components"
|
||||||
|
${SCRIPTS_DIR}/update-components.sh
|
||||||
|
if [[ -n $(git status -s third_party) && ${ALLOW_LOCAL_COMPONENT_CHANGES} != "true" ]]; then
|
||||||
|
echo "ERROR: Building with local component changes."
|
||||||
|
echo "Commit pending changes or rerun with ALLOW_LOCAL_COMPONENT_CHANGES='true'"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
eval $(${SCRIPTS_DIR}/get-component-versions.sh)
|
eval $(${SCRIPTS_DIR}/get-component-versions.sh)
|
||||||
|
|
||||||
if [[ "${NVIDIA_CONTAINER_TOOLKIT_VERSION}${NVIDIA_CONTAINER_TOOLKIT_TAG:+~${NVIDIA_CONTAINER_TOOLKIT_TAG}}" != "${LIBNVIDIA_CONTAINER_VERSION}" ]]; then
|
if [[ "${NVIDIA_CONTAINER_TOOLKIT_VERSION}${NVIDIA_CONTAINER_TOOLKIT_TAG:+~${NVIDIA_CONTAINER_TOOLKIT_TAG}}" != "${LIBNVIDIA_CONTAINER_VERSION}" ]]; then
|
||||||
|
36
scripts/update-components.sh
Executable file
36
scripts/update-components.sh
Executable file
@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
set -e -x
|
||||||
|
|
||||||
|
SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"
|
||||||
|
PROJECT_ROOT="$( cd ${SCRIPTS_DIR}/.. && pwd )"
|
||||||
|
|
||||||
|
git submodule update --init
|
||||||
|
|
||||||
|
echo "Component status before update"
|
||||||
|
git submodule status
|
||||||
|
|
||||||
|
# We update all submodules from their respective remotes
|
||||||
|
# NOTE: Appending `-- [PATH]` will limit the update to a specific component
|
||||||
|
git submodule update --remote
|
||||||
|
|
||||||
|
if [[ -z $(git status -s third_party) ]]; then
|
||||||
|
echo "Components already up to date"
|
||||||
|
else
|
||||||
|
echo "Components updated"
|
||||||
|
git submodule status
|
||||||
|
fi
|
2
third_party/libnvidia-container
vendored
2
third_party/libnvidia-container
vendored
@ -1 +1 @@
|
|||||||
Subproject commit b6f85bb45e23eae0447999501fe37c07877e9058
|
Subproject commit d48f9b0d505fca0aff7c88cee790f9c56aa1b851
|
Loading…
Reference in New Issue
Block a user