diff options
| author | Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-11 13:32:17 +0100 |
|---|---|---|
| committer | Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-11 13:32:17 +0100 |
| commit | ff4a9962d3701b30dc6709500ee3492788b6977b (patch) | |
| tree | 9276adcbe07067495e622f0edf69b7efc1b99490 | |
| parent | 5fe09e04771ed62d05bd3154ea182d1b99c5d8ce (diff) | |
| download | framework-ff4a9962d3701b30dc6709500ee3492788b6977b.tar.gz framework-ff4a9962d3701b30dc6709500ee3492788b6977b.tar.bz2 framework-ff4a9962d3701b30dc6709500ee3492788b6977b.tar.xz framework-ff4a9962d3701b30dc6709500ee3492788b6977b.zip | |
UPDATE: jenkins build and variants
| -rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 3 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 1 | ||||
| -rw-r--r-- | build/jenkins-build.sh | 45 |
3 files changed, 49 insertions, 0 deletions
diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 5dd08f5..b7977f3 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -2,3 +2,6 @@ python: - 2.7 # [not win] - 3.5 - 3.6 +numpy: + - 1.12 + - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index fbfbafa..840590f 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -17,6 +17,7 @@ test: requirements: build: - python + - numpy {{ numpy }} - setuptools run: diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh new file mode 100644 index 0000000..e45a330 --- /dev/null +++ b/build/jenkins-build.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +if [[ -n ${CIL_VERSION} ]] +then + echo Using defined version: $CIL_VERSION +else + export CIL_VERSION=0.10.4 + echo Defining version: $CIL_VERSION +fi +# Script to builds source code in Jenkins environment +# module try-load conda + +# install miniconda if the module is not present +if hash conda 2>/dev/null; then + echo using conda +else + if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then + wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + chmod +x Miniconda3-latest-Linux-x86_64.sh + fi + ./Miniconda3-latest-Linux-x86_64.sh -u -b -p . + PATH=$PATH:./bin +fi + +# presume that git clone is done before this script is launched, if not, uncomment +# git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit +conda install -y conda-build +#export CIL_VERSION=0.10.2 +#cd CCPi-Regularisation-Toolkit # already there by jenkins +# need to call first build +conda build Wrappers/Python/conda-recipe +# then need to call the same with --output +#- otherwise no build is done :-(, just fake file names are generated +export REG_FILES=`conda build Wrappers/Python/conda-recipe --output` +# REG_FILES variable should contain output files +echo files created: $REG_FILES +#upload to anaconda +if [[ -n ${CCPI_CONDA_TOKEN} ]] +then + conda install anaconda-client + while read -r outfile; do + anaconda -v -t ${CCPI_CONDA_TOKEN} upload $outfile --force --label dev + done <<< "$REG_FILES" +else + echo CCPI_CONDA_TOKEN not defined, will not upload to anaconda. +fi |