diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a09f0dda2f9b4dbe6837e799aac0bbf1b741a401..7c8933e4a83c854dcee537489d55fbeae3f9a95d 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 269594b5dba6ff17930ea52b1a7bcc9a5389ca74..5ea7bf111a0086ac23028ea0da40a5aba6ea58a8 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 afbe9a72d094fec2cf211ff8fcde5012e5e4111b..0000000000000000000000000000000000000000 --- 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