From 93edfdca364cdf80046a2c803776541740fe783c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 10 Jan 2019 12:17:54 +0100
Subject: [PATCH] [ci] Test bdt bootstrapping
---
.gitlab-ci.yml | 1 -
ci/bootstrap.sh | 1 +
ci/deploy.sh | 10 ----------
3 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100755 ci/deploy.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a09f0dda..7c8933e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,6 @@ build_macosx_36:
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate myenv
- bdt --help
- - bdt ci deploy
dependencies:
- build_linux_36
- build_macosx_36
diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
index 269594b5..5ea7bf11 100755
--- a/ci/bootstrap.sh
+++ b/ci/bootstrap.sh
@@ -135,6 +135,7 @@ if [ "${1}" == "build" ]; then
elif [ "${1}" == "local" ]; then
run_cmd ${CONDA_ROOT}/bin/conda index ${CONDA_ROOT}/conda-bld
CONDA_CLI_CHANNELS="-c ${CONDA_ROOT}/conda-bld ${CONDA_CLI_CHANNELS}"
+ run_cmd ls -l ${CONDA_ROOT}/conda-bld/
run_cmd ${CONDA_ROOT}/bin/conda create -n "${2}" --override-channels ${CONDA_CLI_CHANNELS} bob.devtools
elif [ "${1}" == "beta" ] || [ "${1}" == "stable" ]; then
run_cmd ${CONDA_ROOT}/bin/conda create -n "${2}" --override-channels ${CONDA_CLI_CHANNELS} bob.devtools
diff --git a/ci/deploy.sh b/ci/deploy.sh
deleted file mode 100755
index afbe9a72..00000000
--- a/ci/deploy.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# Wed Jan 9 16:48:57 CET 2019
-
-deploy_conda_packages ${CONDA_CHANNELS[0]} ${CI_PROJECT_NAME}
-
-# upload the docs from the sphinx folder (usually an artifact of Linux Python
-# 3.6 builds)
-for folder in "${DOC_UPLOADS[@]}"; do
- dav_upload_folder sphinx "${folder}"
-done
--
GitLab