fix release check of .travis.yml and .binstar.yml

mordred-descriptor · Jan 29, 2016 · a7f84e6 · a7f84e6
1 parent 7dddb88
commit a7f84e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.binstar.yml b/.binstar.yml
@@ -10,7 +10,8 @@ engine:
  - python=3.5
 
 script:
-  - if [[ `git rev-parse --abbrev-ref HEAD` != release ]]; then
+  - if [[ "$GIT_BRANCH" != release ]]; then
+      echo "beta version";
       sed -i -e 's/$/b0/' mordred/version.txt;
       echo $BINSTAR_BUILD_MAJOR > __conda_buildnum__.txt;
     fi

diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
   - git config --global user.email "philopon.dependence@gmail.com"
   - git config --global user.name "philopon"
 
-  - if [[ `git rev-parse --abbrev-ref HEAD` != release ]]; then
+  - if [[ "$TRAVIS_BRANCH" != release ]]; then
       sed -i -e 's/$/b0/' mordred/version.txt;
     fi
 
@@ -58,7 +58,7 @@ after_success:
       make html;
 
       git clone -b gh-pages $DOC_REMOTE gh-pages;
-      rm -r gh-pages/$TRAVIS_BRANCH;
+      rm -r gh-pages/$TRAVIS_BRANCH || true;
       cp -r _build/html gh-pages/$TRAVIS_BRANCH;
 
       cd gh-pages;