From 8b0a617d045eb057b085c3acd32f5620bdbc6794 Mon Sep 17 00:00:00 2001
From: Daniel <danielkot@users.noreply.github.com>
Date: Sun, 12 May 2019 20:29:32 +0200
Subject: [PATCH] Update .travis.yml

---
 .travis.yml | 131 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 56 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46c8f2b..167a157 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,64 +3,83 @@ sudo: required
 dist: xenial
 compiler: gcc
 os: linux
+env:
+ - t=aarch64-danio-linux
+ - t=alpha-danio-linux
+ - t=arm-danio-eabi
+ - t=arc-danio-linux
+ - t=c6x-danio-linux
+ - t=parisc64-danio-linux
+ - t=parisc-danio-linux
+ - t=i386-danio-linux
+ - t=i686-danio-gnu
+ - t=ia64-danio-linux
+ - t=m68k-danio-linux
+ - t=microblaze-danio-linux
+ - t=mips64-danio-linux
+ - t=mips-danio-linux
+ - t=powerpc32-danio-linux
+ - t=powerpc64-danio-linux
+ - t=s390-danio-linux
+ - t=sh2-danio-linux
+ - t=sh4-danio-linux
+ - t=riscv32-danio-linux
+ - t=riscv64-danio-linux
+ - t=sparc-danio-linux
+ - t=sparc64-danio-linux
+ - t=x86_64-danio-linux
+ - t=xtensa-danio-linux
+ - t=nds32le-danio-linux
+ - t=or1k-danio-linux
+ - t=hexagon-danio-linux
+ - t=am33_2.0-danio-linux
+ - t=bfin-danio-linux
+ - t=crisv32-danio-linux
+ - t=frv-danio-linux
+ - t=m32r-danio-linux
+ - t=tilepro-danio-linux
+ - t=tilegx-danio-linux
 
-jobs:
-  include:
-  env:
-  - t=aarch64-danio-linux
-  - t=alpha-danio-linux
-  - t=arm-danio-eabi
-  - t=arc-danio-linux
-  - t=c6x-danio-linux
-  - t=parisc64-danio-linux
-  - t=parisc-danio-linux
-  - t=i386-danio-linux
-  - t=i686-danio-gnu
-  - t=ia64-danio-linux
-  - t=m68k-danio-linux
-  - t=microblaze-danio-linux
-  - t=mips64-danio-linux
-  - t=mips-danio-linux
-  - t=powerpc32-danio-linux
-  - t=powerpc64-danio-linux
-  - t=s390-danio-linux
-  - t=sh2-danio-linux
-  - t=sh4-danio-linux
-  - t=riscv32-danio-linux
-  - t=riscv64-danio-linux
-  - t=sparc-danio-linux
-  - t=sparc64-danio-linux
-  - t=x86_64-danio-linux
-  - t=xtensa-danio-linux
-  - t=nds32le-danio-linux
-  - t=or1k-danio-linux
-  - t=hexagon-danio-linux
-  - t=am33_2.0-danio-linux
-  - t=bfin-danio-linux
-  - t=crisv32-danio-linux
-  - t=frv-danio-linux
-  - 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
-    
-  - 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:
-     provider: releases
-     api_key: ${token}
-     file_glob: true
-     file: out/*
-     on:
-      tags: true
-
-before_install: |
+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
- tor&
- sleep 15
+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:
+    provider: releases
+    api_key: ${token}
+    file_glob: true
+    file: out/*
+    on:
+     tags: true
+
+after_failure:
+    - tail -n 1000 error.log