From 0cbba305c062e07b24e7ed0ba987c450d747f210 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 21 Jan 2019 15:52:02 +0100
Subject: [PATCH] [data] Modify common CI architecture to follow avoiding
before/after script sections
---
.../data/gitlab-ci/single-package.yaml | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 8ea18b74..675ac5e2 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -18,10 +18,9 @@ stages:
# Build targets
.build_template: &build_job
stage: build
- before_script:
- - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- - python3 bootstrap.py channel bdt
script:
+ - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
+ - python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate bdt
- bdt ci build -vv
@@ -65,6 +64,14 @@ build_linux_36:
variables:
PYTHON_VERSION: "3.6"
BUILD_EGG: "true"
+ script:
+ - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
+ - python3 bootstrap.py -vv channel bdt
+ - source ${CONDA_ROOT}/etc/profile.d/conda.sh
+ - conda activate bdt
+ - bdt ci build -vv
+ - bdt ci readme -vv
+ - bdt ci clean -vv
artifacts:
expire_in: 1 week
paths:
@@ -82,10 +89,9 @@ build_macosx_36:
# Deploy targets
.deploy_template: &deploy_job
stage: deploy
- before_script:
+ script:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py channel bdt
- script:
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate bdt
- bdt ci deploy -vv
@@ -125,13 +131,13 @@ pypi:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- branches
- before_script:
- - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- - python3 bootstrap.py channel bdt
script:
+ - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
+ - python3 bootstrap.py -vv channel bdt
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate bdt
- bdt ci pypi -vv
+ - bdt ci clean -vv
dependencies:
- build_linux_36
- build_macosx_36
--
GitLab