Skip to content
This repository was archived by the owner on Oct 27, 2023. It is now read-only.

Commit e54e25d

Browse files
author
Evan Lezar
committed
Merge branch 'set-version-in-ci' into 'master'
Require that LIB_VERSION be set as make variable See merge request nvidia/container-toolkit/container-runtime!68
2 parents 35a9761 + 5d7c66a commit e54e25d

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.gitlab-ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ stages:
55
- build-all
66

77
variables:
8-
# We specify the TOOLKIT_VERSION and TOOLKIT_TAG variable to allow packages
8+
# We specify the LIB_VERSION, TOOLKIT_VERSION, and TOOLKIT_TAG variable to allow packages
99
# to be built.
10+
LIB_VERSION: 999.999.999
11+
LIB_TAG: dummy+lib
1012
TOOLKIT_VERSION: 999.999.999
11-
TOOLKIT_TAG: dummy
13+
TOOLKIT_TAG: dummy+toolkit
1214

1315
.build-setup: &build-setup
1416
image: docker:19.03.8

Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@
1313
# limitations under the License.
1414

1515
LIB_NAME := nvidia-container-runtime
16-
LIB_VERSION := 3.7.0
17-
LIB_TAG ?= rc.1
16+
# Define the package version and tag. Since this package is released as part of
17+
# the NVIDIA Container Toolkit, these versions are specified where they are
18+
# built or when invoking the MAKE command.
19+
LIB_VERSION ?= # Set by CI
20+
LIB_TAG ?= # Set by CI
21+
22+
ifeq ($(strip $(LIB_VERSION)),)
23+
$(error LIB_VERSION must be specified)
24+
endif
1825

1926
# Define the nvidia-container-toolkit version on which the nvidia-docker2
2027
# package depends. It is recommended that the TOOLKIT_TAG and the LIB_TAG match.

0 commit comments

Comments
 (0)