From 6742ed0d01b98c55b6b2cc18e4958fe2dc6ce783 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 14:12:09 +0100 Subject: UPDATE: jenkins build and variants --- build/jenkins-build.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 build/jenkins-build.sh (limited to 'build') 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 -- cgit v1.2.3 From 1e61f3adac0a4c395cc9f78d0cdd234a64db1764 Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Fri, 11 Jan 2019 14:19:18 +0100 Subject: update channels --- build/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index e45a330..b4bca61 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -27,7 +27,7 @@ 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 +conda build Wrappers/Python/conda-recipe -c conda-forge -c ccpi # 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` -- cgit v1.2.3 From 5a86023487d87c8a61fd94153d418a6555d1bbee Mon Sep 17 00:00:00 2001 From: Kulhanek Date: Mon, 28 Jan 2019 12:18:02 +0000 Subject: UPDATE: using universal build --- build/jenkins-build.sh | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) (limited to 'build') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index b4bca61..009d43d 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 -# 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" +bash <(curl -L https://raw.githubusercontent.com/vais-ral/CCPi-VirtualMachine/master/scripts/jenkins-build.sh) -- cgit v1.2.3