Update Travis.

.github/travis_build.sh

@@ -66,7 +66,10 @@ fi
 #
 
 cd / && cd $ucl_BUILDDIR || exit 1
-if [[ -n $BM_CROSS || $TRAVIS_OS_NAME == windows ]]; then
+# patch UCL
+sed 's/^#elif (ACC_ARCH_AMD64 || ACC_ARCH_IA64)$/& \&\& !defined(__ILP32__)/' $ucl_SRCDIR/acc/acc_chk.ch > a.tmp
+if cmp -s a.tmp $ucl_SRCDIR/acc/acc_chk.ch; then rm a.tmp; else mv a.tmp $ucl_SRCDIR/acc/acc_chk.ch; fi
+if [[ $BUILD_LOCAL_UCL == 1 ]]; then
     # ucl-1.03/configure is too old - build manually
     rm -f ./*.o libucl.a
     $CC -O2 -I$ucl_SRCDIR/include -I$ucl_SRCDIR -c $ucl_SRCDIR/src/*.c

.github/travis_deploy.sh

@@ -35,9 +35,10 @@ else
     branch=$TRAVIS_BRANCH
     if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi
 fi
-subdir=${subdir%%:*}; subdir=${subdir%%/*}; subdir=${subdir%%-*}
+subdir=${subdir%%:*}; subdir=${subdir%%/*}; subdir=${subdir%%--*}
 case $branch in
     devel*) ;;
+    gitlab*) ;;
     master*) ;;
     travis*) ;;
     *) exit 0;;
@@ -166,6 +167,11 @@ while true; do
         if git push    $ssh_repo $branch; then break; fi
     fi
     git fetch -v origin $branch
+    git branch -a -v
+    if [[ $new_branch == 1 ]]; then
+        git branch --set-upstream-to origin/$branch
+        new_branch=0
+    fi
     git rebase origin/$branch
     sleep $((RANDOM % 5 + 1))
     let i+=1

.github/travis_init.sh

@@ -49,6 +49,7 @@ if [[ -z $CC_OVERRIDE ]]; then
 CC=false CXX=false SCAN_BUILD=false
 AR=ar SIZE=size
 if [[ -n $APPVEYOR_JOB_ID ]]; then
+    BUILD_LOCAL_UCL=1
     BUILD_LOCAL_ZLIB=1
     if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
         export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++"
@@ -65,6 +66,7 @@ if [[ -n $APPVEYOR_JOB_ID ]]; then
     esac
 fi # APPVEYOR_JOB_ID
 if [[ -n $BM_CROSS ]]; then
+    BUILD_LOCAL_UCL=1
     BUILD_LOCAL_ZLIB=1
     if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
         export upx_EXTRA_LDFLAGS="-static-libgcc -static-libstdc++"
@@ -148,7 +150,7 @@ case $BM_C in
     clang*-m64) CC="$CC -m64";  CXX="$CXX -m64" ;;
     gcc*-m32)   CC="$CC -m32";  CXX="$CXX -m32" ;;
     gcc*-m64)   CC="$CC -m64";  CXX="$CXX -m64" ;;
-    gcc*-mx32)  CC="$CC -mx32"; CXX="$CXX -mx32" ;;
+    gcc*-mx32)  CC="$CC -mx32"; CXX="$CXX -mx32"; BUILD_LOCAL_ZLIB=1 ;;
 esac
 if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
     CC="$CC -std=gnu89"