From b62fb5d06279f9cea41e7abc8e2d65aa6ee66178 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 14:24:31 +0100 Subject: UPDATE: jenkins build and variants --- .../Python/conda-recipe/conda_build_config.yaml | 7 ++++ Wrappers/Python/conda-recipe/meta.yaml | 2 +- build/jenkins-build.sh | 45 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Wrappers/Python/conda-recipe/conda_build_config.yaml create mode 100644 build/jenkins-build.sh diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml new file mode 100644 index 0000000..b7977f3 --- /dev/null +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -0,0 +1,7 @@ +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 ca91ed0..965d81d 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -12,7 +12,7 @@ build: requirements: build: - python - - numpy + - numpy {{ numpy }} - setuptools run: diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh new file mode 100644 index 0000000..25c7228 --- /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 -c conda-forge -c ccpi -c astra-toolbox +# 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 -- cgit v1.2.3 From 26443ce2065c6150829b03fa295a36e66edf1a60 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:37:32 +0100 Subject: UPDATE pin_compatible --- Wrappers/Python/conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 965d81d..b367948 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -16,6 +16,7 @@ requirements: - setuptools run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - scipy -- cgit v1.2.3 From 3b1bd1bbe7a65fe055d09ed1281e68e452879c01 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 14 Jan 2019 13:47:32 +0100 Subject: update --- Wrappers/Python/conda-recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index b367948..2dd8aab 100755 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -2,7 +2,6 @@ package: name: ccpi-astra version: {{ environ['CIL_VERSION'] }} - build: preserve_egg_dir: False script_env: @@ -26,4 +25,4 @@ requirements: about: home: http://www.ccpi.ac.uk license: GPLv3 - summary: 'CCPi Toolbox' + summary: 'CCPi Toolbox' \ No newline at end of file -- cgit v1.2.3 From e521fdc907fe67afcec610bf4ae05aedcf71fc86 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 28 Jan 2019 12:12:18 +0000 Subject: UPDATE: using universal build script --- build/jenkins-build.sh | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 25c7228..6c8360c 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,45 +1,3 @@ #!/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 -c conda-forge -c ccpi -c astra-toolbox -# 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 +export CCPI_BUILD_ARGS="-c conda-forge -c ccpi -c astra-toolbox" +bash <(curl -L https://raw.githubusercontent.com/vais-ral/CCPi-VirtualMachine/master/scripts/jenkins-build.sh) -- cgit v1.2.3