summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorKulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-24 14:17:20 +0000
committerKulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-24 14:17:20 +0000
commit2281cb319701d348384a6c00a1948209350c41ad (patch)
treee37c63c0e8318fbb067147aeffbc89f406e251e8 /build
parent619e972559992684854eef854e60fbc363e93819 (diff)
downloadregularization-2281cb319701d348384a6c00a1948209350c41ad.tar.gz
regularization-2281cb319701d348384a6c00a1948209350c41ad.tar.bz2
regularization-2281cb319701d348384a6c00a1948209350c41ad.tar.xz
regularization-2281cb319701d348384a6c00a1948209350c41ad.zip
UPDATE: branch taken from symbolic-full-name
Diffstat (limited to 'build')
-rwxr-xr-xbuild/jenkins-build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh
index 87ca54f..62b1ece 100755
--- a/build/jenkins-build.sh
+++ b/build/jenkins-build.sh
@@ -33,7 +33,7 @@ else
PATH=$PATH:./bin
fi
-GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+GIT_BRANCH=`git rev-parse --symbolic-full-name HEAD`
echo on branch ${GIT_BRANCH}
cat .git/HEAD
@@ -53,7 +53,7 @@ echo files created: $REG_FILES
# and TODO pull request not to upload
if [[ -n ${CCPI_CONDA_TOKEN} ]]; then
- if [[ ${GIT_BRANCH} == "master" ]]; then
+ if [[ ${GIT_BRANCH} == "refs/heads/master" ]]; then
conda install anaconda-client
while read -r outfile; do
#if >0 commit (some _ in version) then marking as dev build