diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8372c06b2f02484be93c1caedce43078615c287f..77ca97b6a25ae52f0d3b8e5268fa9ca48e86d01f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,57 +12,54 @@ stages:
# Build targets
-.build_template: &build_job
+.build_template:
stage: build
script:
- python3 ./bob/devtools/bootstrap.py -vv build
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
- python3 ./bob/devtools/build.py -vv
- cache: &build_caches
+ artifacts:
+ expire_in: 1 week
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
-.build_linux_template: &linux_build_job
- <<: *build_job
+.build_linux_template:
+ extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
artifacts:
- expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
cache:
- <<: *build_caches
key: "linux-cache"
-.build_macosx_template: &macosx_build_job
- <<: *build_job
+.build_macosx_template:
+ extends: .build_template
tags:
- macosx
artifacts:
- expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
cache:
- <<: *build_caches
key: "macosx-cache"
build_linux_36:
- <<: *linux_build_job
+ extends: .build_linux_template
variables:
PYTHON_VERSION: "3.6"
-
build_linux_37:
- <<: *linux_build_job
+ extends: .build_linux_template
variables:
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
@@ -72,28 +69,26 @@ build_linux_37:
- conda activate base
- python3 ./bob/devtools/build.py -vv --twine-check
artifacts:
- expire_in: 1 week
paths:
- dist/*.zip
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
-
build_macosx_36:
- <<: *macosx_build_job
+ extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.6"
build_macosx_37:
- <<: *macosx_build_job
+ extends: .build_macosx_template
variables:
PYTHON_VERSION: "3.7"
# Deploy targets
-.deploy_template: &deploy_job
+.deploy_template:
stage: deploy
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
@@ -109,7 +104,7 @@ build_macosx_37:
- build_macosx_37
tags:
- docker
- cache: &build_caches
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
@@ -117,14 +112,14 @@ build_macosx_37:
deploy_beta:
- <<: *deploy_job
+ extends: .deploy_template
environment: beta
only:
- master
deploy_stable:
- <<: *deploy_job
+ extends: .deploy_template
environment: stable
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
@@ -152,7 +147,7 @@ pypi:
- build_macosx_37
tags:
- docker
- cache: &build_caches
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index d67625ebbbebeb1a5cbfcf4e04e6b917ec4e7af5..4b97b9cf0b4ca9d7e71ae5aec2690d06756874b5 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -15,7 +15,7 @@ stages:
# Build targets
-.build_template: &build_job
+.build_template:
stage: build
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -27,7 +27,7 @@ stages:
- bdt ci base-build -vv --python=3.7 python.txt
- '[ "${CI_COMMIT_REF_NAME}" = "master" ] && bdt ci base-deploy -vv'
- bdt ci clean -vv
- cache: &build_caches
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
@@ -35,19 +35,17 @@ stages:
build_linux:
- <<: *build_job
+ extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
cache:
- <<: *build_caches
key: "linux-cache"
build_macosx:
- <<: *build_job
+ extends: .build_template
tags:
- macosx
cache:
- <<: *build_caches
key: "macosx-cache"
diff --git a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
index 53ddb6b9e1ffb03337262eaf42cd3b78fa160a56..83568eda9a5b15acd25ebd8cff182899b8acd8e4 100644
--- a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
+++ b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
@@ -1,3 +1,7 @@
build_linux_36:
tags:
- docker-build
+
+build_linux_37:
+ tags:
+ - docker-build
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index ae3584c4f4a01c98ab27a6bde1757beb7bd4b010..45a80f446ee2b93dbea4b323fec33d1a80e1111d 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -47,11 +47,11 @@ stages:
key: "linux-cache"
-build_linux_36:
+build_linux_37:
<<: *linux_build_job
variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
- PYTHON_VERSION: "3.6"
+ PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
artifacts:
expire_in: 1 week
@@ -71,7 +71,7 @@ build_linux_36:
- bdt ci deploy -vv
- bdt ci clean -vv
dependencies:
- - build_linux_36
+ - build_linux_37
tags:
- docker
cache: &build_caches
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 3f0939bbb99eb44de0c3be273e14cf895078a7ff..85606917986bc2db60061c42a1ae95f00c581f2e 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -19,7 +19,6 @@ stages:
stage: build
variables:
CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda"
- PYTHON_VERSION: "3.6"
PYTHONUNBUFFERED: 1
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -35,13 +34,31 @@ stages:
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
-linux:
+build_linux_36:
extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.6"
tags:
- docker
-macosx:
+build_linux_37:
extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.7"
+ tags:
+ - docker
+
+build_macosx_36:
+ extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.6"
+ tags:
+ - macosx
+
+build_macosx_37:
+ extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.6"
tags:
- macosx
@@ -58,7 +75,7 @@ macosx:
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
- bdt ci clean-betas -vv
- cache: &test_caches
+ cache:
key: "linux-cache"
paths:
- miniconda.sh
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index ff6f57f0ebfc3ef2f6fc75dc468a452873396005..9f30976d8f6812c70406a49e5afb2e73cd8d199c 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -17,7 +17,7 @@ stages:
# Build targets
-.build_template: &build_job
+.build_template:
stage: build
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -26,44 +26,57 @@ stages:
- conda activate base
- bdt ci build -vv
- bdt ci clean -vv
- cache: &build_caches
+ artifacts:
+ expire_in: 1 week
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
-.build_linux_template: &linux_build_job
- <<: *build_job
+.build_linux_template:
+ extends: .build_template
tags:
- docker
image: continuumio/conda-concourse-ci
artifacts:
- expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
cache:
- <<: *build_caches
key: "linux-cache"
-.build_macosx_template: &macosx_build_job
- <<: *build_job
+.build_macosx_template:
+ extends: .build_template
tags:
- macosx
artifacts:
- expire_in: 1 week
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache:
- <<: *build_caches
key: "macosx-cache"
+build_macosx_36:
+ extends: .build_macosx_template
+ variables:
+ PYTHON_VERSION: "3.6"
+
+build_macosx_37:
+ extends: .build_macosx_template
+ variables:
+ PYTHON_VERSION: "3.7"
+
build_linux_36:
- <<: *linux_build_job
+ extends: .build_linux_template
variables:
PYTHON_VERSION: "3.6"
+
+build_linux_37:
+ extends: .build_linux_template
+ variables:
+ PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -74,21 +87,14 @@ build_linux_36:
- bdt ci readme -vv dist/*.zip
- bdt ci clean -vv
artifacts:
- expire_in: 1 week
paths:
- dist/*.zip
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
-build_macosx_36:
- <<: *macosx_build_job
- variables:
- PYTHON_VERSION: "3.6"
-
-
# Test targets (not normally used)
-.test_template: &test_job
+.test_template:
stage: test
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -97,34 +103,32 @@ build_macosx_36:
- conda activate base
- bdt ci test -vv
- bdt ci clean -vv
- cache: &test_caches
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
- ${CONDA_ROOT}/pkgs/urls.txt
-.test_linux_template: &linux_test_job
- <<: *test_job
+.test_linux_template:
+ extends: .test_template
tags:
- docker
image: continuumio/conda-concourse-ci
cache:
- <<: *test_caches
key: "linux-cache"
-.test_macosx_template: &macosx_test_job
- <<: *test_job
+.test_macosx_template:
+ extends: .test_template
tags:
- macosx
cache:
- <<: *test_caches
key: "macosx-cache"
# Deploy targets
-.deploy_template: &deploy_job
+.deploy_template:
stage: deploy
script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
@@ -136,9 +140,11 @@ build_macosx_36:
dependencies:
- build_linux_36
- build_macosx_36
+ - build_linux_37
+ - build_macosx_37
tags:
- docker
- cache: &build_caches
+ cache:
paths:
- miniconda.sh
- ${CONDA_ROOT}/pkgs/*.tar.bz2
@@ -146,14 +152,14 @@ build_macosx_36:
deploy_beta:
- <<: *deploy_job
+ extends: .deploy_template
environment: beta
only:
- master
deploy_stable:
- <<: *deploy_job
+ extends: .deploy_template
environment: stable
only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
@@ -178,5 +184,7 @@ pypi:
dependencies:
- build_linux_36
- build_macosx_36
+ - build_linux_37
+ - build_macosx_37
tags:
- docker