diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-22 15:29:16 +0000 |
|---|---|---|
| committer | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-22 15:29:16 +0000 |
| commit | 93224f30e5072ec0b19958f053e2f58d07bf1f4b (patch) | |
| tree | 6b8fd8b140a0794fb5465a7d3741fc17caf47de4 | |
| parent | b63188fc01a6c0a2bf9637ed1660d0dbdd48e6fe (diff) | |
| download | regularization-93224f30e5072ec0b19958f053e2f58d07bf1f4b.tar.gz regularization-93224f30e5072ec0b19958f053e2f58d07bf1f4b.tar.bz2 regularization-93224f30e5072ec0b19958f053e2f58d07bf1f4b.tar.xz regularization-93224f30e5072ec0b19958f053e2f58d07bf1f4b.zip | |
UPDATE 3: check git branch
| -rwxr-xr-x | build/jenkins-build.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index b8b2aef..4f96194 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -33,6 +33,9 @@ else PATH=$PATH:./bin fi +GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` +echo on branch ${GIT_BRANCH} + # 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 @@ -46,9 +49,7 @@ export REG_FILES=`conda build Wrappers/Python/conda-recipe --output` echo files created: $REG_FILES # upload to anaconda only if token is defined -# and TODO pull request not to upload -GIT_BRANCH=`git symbolic-ref --short HEAD` -echo on branch ${GIT_BRANCH} +# and TODO pull request not to upload if [[ -n ${CCPI_CONDA_TOKEN} ]]; then if [[ ${GIT_BRANCH}=="master" ]]; then |