Update .travis.yml

.travis.yml

@@ -3,9 +3,6 @@ sudo: required
 dist: xenial
 compiler: gcc
 os: linux
-
-jobs:
-  include:
 env:
  - t=aarch64-danio-linux
  - t=alpha-danio-linux
@@ -42,11 +39,38 @@ jobs:
  - t=m32r-danio-linux
  - t=tilepro-danio-linux
  - t=tilegx-danio-linux
-  - name: gcc32
-    script: ./danio_gcc.sh ${t} 32 && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32   
-  - name: gcc64
-    script: ./danio_gcc.sh ${t} 64 && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64
 
+before_script: |
+ sudo apt update -qq
+ sudo apt install -qq -y tor rsync torsocks sshpass git-core gnupg flex bison lftp gperf m4 build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libxml2-utils xsltproc schedtool gettext texinfo
+ sudo apt-get clean
+ chmod +x -v *.sh
+script: |
+ build()
+ {
+ (
+   echo "danio-gcc32"
+   ./danio_gcc.sh ${t} 32 2>error.log && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32
+   echo "danio-gcc64"
+   ./danio_gcc.sh ${t} 64 2>error.log && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64
+ ) &
+ local build_pid=$!
+ {
+  while :; do
+   sleep 300
+   printf "Builder is still running...\r"
+  done
+ } &
+ local runner_pid=$!
+ wait $build_pid 2>/dev/null
+ local result=$?
+ kill $runner_pid
+ wait $runner_pid 2>/dev/null
+ return $result
+ }
+ build
+
+after_script:
   - stage: upload
     script: mkdir -pv out && sshpass -p "${passwd}" torify rsync -Pavr ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32/* out && sshpass -p "${passwd}" torify ssh ${login}@${tor} rm -rvf /mnt/.sda1/travis/danio-gcc/64/* /mnt/.sda1/travis/danio-gcc/32/* && rm -rf out/*.log
     deploy:
@@ -57,10 +81,5 @@ jobs:
     on:
      tags: true
 
-before_install: |
- sudo apt update -qq
- sudo apt install -qq -y tor rsync torsocks sshpass git-core gnupg flex bison lftp gperf m4 build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libxml2-utils xsltproc schedtool gettext texinfo
- sudo apt-get clean
- chmod +x -v *.sh
- tor&
- sleep 15
+after_failure:
+    - tail -n 1000 error.log