UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 16:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-devel-release-version' into 'master'

Browse Source 
Rename RELEASE_DEVEL_TAG for consistency

See merge request nvidia/container-toolkit/container-toolkit!64
This commit is contained in:
Evan Lezar 2021-10-27 11:52:57 +00:00
commit 55328126c6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nvidia-ci.yml
View File

@ -29,7 +29,7 @@ variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
# Release "devel"-tagged images off the master branch # Release "devel"-tagged images off the master branch
RELEASE_DEVEL_BRANCH: "master" RELEASE_DEVEL_BRANCH: "master"
RELEASE_DEVEL_TAG: "devel" DEVEL_RELEASE_IMAGE_VERSION: "devel"
# On the multi-arch builder we don't need the qemu setup. # On the multi-arch builder we don't need the qemu setup.
SKIP_QEMU_SETUP: "1" SKIP_QEMU_SETUP: "1"

4
build/container/Makefile
View File

@ -50,8 +50,8 @@ $(PUSH_TARGETS): push-%:
# For the default push target we also push a short tag equal to the version. # For the default push target we also push a short tag equal to the version.
# We skip this for the development release # We skip this for the development release
RELEASE_DEVEL_TAG ?= devel DEVEL_RELEASE_IMAGE_VERSION ?= devel
ifneq ($(strip $(VERSION)),$(RELEASE_DEVEL_TAG)) ifneq ($(strip $(VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION))
push-$(DEFAULT_PUSH_TARGET): push-short push-$(DEFAULT_PUSH_TARGET): push-short
endif endif
push-short: push-short: