diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 042ee28..bb50819 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -15,11 +15,7 @@ cd "$WORKSPACE" # Get latest tag and number of commits since tag export GIT_DESCRIBE_TAG=`git describe --abbrev=0 --tags` export GIT_DESCRIBE_NUMBER=`git rev-list ${GIT_DESCRIBE_TAG}..HEAD --count` - -# If nightly build, append current YYMMDD to version -if [[ "$BUILD_MODE" = "branch" && "$SOURCE_BRANCH" = branch-* ]] ; then - export VERSION_SUFFIX=`date +%y%m%d` -fi +export RAPIDS_DATE_STRING=$(date +%y%m%d) # Setup 'gpuci_conda_retry' for build retries (results in 2 total attempts) export GPUCI_CONDA_RETRY_MAX=1 diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 52f1191..d44847d 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -22,6 +22,7 @@ cd $WORKSPACE export GIT_DESCRIBE_TAG=`git describe --abbrev=0 --tags` export GIT_DESCRIBE_NUMBER=`git rev-list ${GIT_DESCRIBE_TAG}..HEAD --count` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` +export RAPIDS_DATE_STRING=$(date +%y%m%d) ################################################################################ # SETUP - Check environment diff --git a/conda/recipes/jupyterlab-nvdashboard/meta.yaml b/conda/recipes/jupyterlab-nvdashboard/meta.yaml index 5dd4b54..1941ae6 100644 --- a/conda/recipes/jupyterlab-nvdashboard/meta.yaml +++ b/conda/recipes/jupyterlab-nvdashboard/meta.yaml @@ -1,7 +1,7 @@ -{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} +{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} -{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %} {% set py_version=environ.get('CONDA_PY', 37) %} +{% set date_string = environ['RAPIDS_DATE_STRING'] %} package: name: jupyterlab-nvdashboard @@ -11,7 +11,8 @@ source: path: ../../.. build: - number: {{ git_revision_count }} + number: {{ GIT_DESCRIBE_NUMBER }} + string: py_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} script: python -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv noarch: python script_env: