Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'set-version-in-ci' into 'master'
Browse files Browse the repository at this point in the history
Require that LIB_VERSION be set as make variable

See merge request nvidia/container-toolkit/nvidia-docker!33
  • Loading branch information
Evan Lezar committed Nov 30, 2021
2 parents 2629310 + b691071 commit 9d1e413
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ stages:
- build-all

variables:
# We specify the TOOLKIT_VERSION and TOOLKIT_TAG variable to allow packages
# We specify the LIB_VERSION, TOOLKIT_VERSION, and TOOLKIT_TAG variable to allow packages
# to be built.
LIB_VERSION: 999.999.999
LIB_TAG: dummy+lib
TOOLKIT_VERSION: 999.999.999
TOOLKIT_TAG: dummy
TOOLKIT_TAG: dummy+toolkit

.build-setup: &build-setup
image: docker:19.03.8
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@
# limitations under the License.

LIB_NAME := nvidia-docker2
LIB_VERSION := 2.8.0
LIB_TAG ?= rc.1
# Define the package version and tag. Since this package is released as part of
# the NVIDIA Container Toolkit, these versions are specified where they are
# built or when invoking the MAKE command.
LIB_VERSION ?= # Set by CI
LIB_TAG ?= # Set by CI

ifeq ($(strip $(LIB_VERSION)),)
$(error LIB_VERSION must be specified)
endif

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

0 comments on commit 9d1e413

Please sign in to comment.