Merge branch 'master' into dev

.travis.yml

@@ -57,12 +57,18 @@ before_install:
 script:
   - if [ "${BUILD_OFFICIAL:-}" != "" ]; then
       mkdir -p ~/src/ljt.nightly &&
+      if [ -f .git/shallow ]; then
+        mv .git/shallow .git/shallow.bak;
+      fi &&
       if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-        docker run -v $HOME/src/ljt.nightly:/root/src/ljt.nightly -v $HOME/src/buildscripts:/root/src/buildscripts -t dcommander/buildljt:latest bash -c "~/src/buildscripts/buildljt -r https://github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_BRANCH -v" &&
+        docker run -v $HOME/src/ljt.nightly:/root/src/ljt.nightly -v $HOME/src/buildscripts:/root/src/buildscripts -v $TRAVIS_BUILD_DIR:/root/src/libjpeg-turbo -t dcommander/buildljt:latest bash -c "~/src/buildscripts/buildljt -r file:///root/src/libjpeg-turbo $TRAVIS_BRANCH -v" &&
         sudo chown -R travis:travis ~/src/ljt.nightly;
       else
-        PATH=$PATH:~/src/gas-preprocessor ~/src/buildscripts/buildljt -r https://github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_BRANCH -v;
-      fi;
+        PATH=$PATH:~/src/gas-preprocessor ~/src/buildscripts/buildljt -r file://$TRAVIS_BUILD_DIR $TRAVIS_BRANCH -v;
+      fi &&
+      if [ -f .git/shallow.bak ]; then
+        mv .git/shallow.bak .git/shallow;
+      fi
     fi
   - if [ "${BUILD_OFFICIAL:-}" == "" ]; then
       autoreconf -fiv &&
@@ -96,12 +102,9 @@ before_deploy:
 
 deploy:
   provider: script
-  on:
-    branch: master
-  on:
-    branch: dev
   script:
     if [ "${BUILD_OFFICIAL:-}" != "" ]; then
       mv ~/src/ljt.nightly/latest/log-$TRAVIS_OS_NAME.txt ~/src/ljt.nightly/latest/files/ &&
       ~/src/buildscripts/uploadljt dcommander $TRAVIS_BRANCH.$TRAVIS_OS_NAME;
     fi
+  all_branches: true

appveyor.yml

@@ -36,7 +36,7 @@ install:
 
 build_script:
   - cmd: >-
-      bash c:/buildscripts/buildljt -r file://%CD:\=/% -b /c/ljt.nightly -v
+      bash c:/buildscripts/buildljt -r file://%CD:\=/% -b /c/ljt.nightly %APPVEYOR_REPO_BRANCH% -v
 
       move c:\ljt.nightly\files\*.tar.gz .