From 06540e88d5713ab2cf9639fc83b1282c5667e78a Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 5 Feb 2021 18:27:11 +0100
Subject: [PATCH] [gitlab-ci] Enable py38 builds
---
.../data/gitlab-ci/beat-docker-package.yaml | 4 ++++
bob/devtools/data/gitlab-ci/docs.yaml | 2 +-
bob/devtools/data/gitlab-ci/nightlies.yaml | 17 ++++++++++++++++
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
.../data/gitlab-ci/single-package.yaml | 20 ++++++++++++++++++-
5 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml
index cf45e9c2..980d7e10 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_37:
tags:
- docker-build
+
+build_linux_38:
+ tags:
+ - docker-build
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index a24fa2ca..299ee797 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -39,7 +39,7 @@ build:
stage: build
variables:
GITLAB_CHECKOUT_STRATEGY: "https://gitlab-ci-token:${CI_BUILD_TOKEN}@gitlab.idiap.ch/"
- PYTHON_VERSION: "3.7"
+ PYTHON_VERSION: "3.8"
BUILD_EGG: "true"
script:
- yum -y install dejavu-sans-fonts
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index fdd80009..2b2ab48a 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -50,6 +50,13 @@ build_linux_37:
cache:
key: 'build-py37'
+build_linux_38:
+ extends: .build_linux_template
+ variables:
+ PYTHON_VERSION: "3.8"
+ cache:
+ key: 'build-py38'
+
build_macos_intel_37:
extends: .build_template
variables:
@@ -60,6 +67,16 @@ build_macos_intel_37:
cache:
key: 'build-py37'
+build_macos_intel_38:
+ extends: .build_template
+ variables:
+ PYTHON_VERSION: "3.8"
+ tags:
+ - macos
+ - intel
+ cache:
+ key: 'build-py38'
+
# Periodic cleanup of beta packages
.cleanup_template:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index b9314488..c804564f 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -50,7 +50,7 @@ build_linux:
- docker
image: docker.idiap.ch/bob/docker-images/c3i-linux-64
variables:
- PYTHON_VERSION: "3.7"
+ PYTHON_VERSION: "3.8"
BUILD_EGG: "true"
script:
- bdt ci build -vv
@@ -68,7 +68,7 @@ build_linux:
build_macos_intel:
variables:
- PYTHON_VERSION: "3.7"
+ PYTHON_VERSION: "3.8"
cache:
key: "build"
extends: .build_template
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 7938372e..f512d032 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -74,10 +74,24 @@ build_macos_intel_37:
cache:
key: "build-py37"
+build_macos_intel_38:
+ extends: .build_macos_intel_template
+ variables:
+ PYTHON_VERSION: "3.8"
+ cache:
+ key: "build-py38"
+
build_linux_37:
extends: .build_linux_template
variables:
PYTHON_VERSION: "3.7"
+ cache:
+ key: "build-py37"
+
+build_linux_38:
+ extends: .build_linux_template
+ variables:
+ PYTHON_VERSION: "3.8"
BUILD_EGG: "true"
script:
- bdt ci build -vv
@@ -90,7 +104,7 @@ build_linux_37:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
cache:
- key: "build-py37"
+ key: "build-py38"
# Test targets (not normally used)
@@ -128,7 +142,9 @@ build_linux_37:
- bdt ci clean -vv
dependencies:
- build_linux_37
+ - build_linux_38
- build_macos_intel_37
+ - build_macos_intel_38
tags:
- docker
cache:
@@ -167,7 +183,9 @@ pypi:
- bdt ci clean -vv
dependencies:
- build_linux_37
+ - build_linux_38
- build_macos_intel_37
+ - build_macos_intel_38
tags:
- docker
cache:
--
GitLab