merge develop before running ci.

qcif · Oct 18, 2018 · eeafd6f · eeafd6f
1 parent 2a291a9
commit eeafd6f
Show file tree

Hide file tree

Showing 3 changed files with 1,558 additions and 1,161 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -59,6 +59,7 @@ for:
     only:
       - /ci/
   test_script:
+    - git merge develop || exit
     - yarn run clean
     - yarn run unit
     - yarn run pack

diff --git a/travis_script.sh b/travis_script.sh
@@ -3,11 +3,10 @@ set -ev
 unset -f cd
 shell_session_update() { :; }
 if [ "${TRAVIS_BRANCH}" == "ci" ] || [ "${TRAVIS_BRANCH}" == "testci" ]; then
+  git merge develop || exit
   sudo rm -Rf rm /tmp/.X*
   export DISPLAY=':99.0'
   Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
   yarn run clean && yarn run pack && yarn run cucumber:postpack:witharg $@
-# else
-#   yarn run release:predraft
 fi
 set +e