diff --git a/distros/fedora b/distros/fedora deleted file mode 120000 index 4d0827986..000000000 --- a/distros/fedora +++ /dev/null @@ -1 +0,0 @@ -redhat \ No newline at end of file diff --git a/distros/opensuse/redalert.wav b/distros/opensuse/redalert.wav deleted file mode 120000 index eec3dce64..000000000 --- a/distros/opensuse/redalert.wav +++ /dev/null @@ -1 +0,0 @@ -../redhat/redalert.wav \ No newline at end of file diff --git a/utils/packpack/heartbeat.sh b/utils/packpack/heartbeat.sh new file mode 100755 index 000000000..c327da4a0 --- /dev/null +++ b/utils/packpack/heartbeat.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# A script to provide background noise so Travis doesn't kill us due to inactivity +# written by Andrew Bauer + +while true; do + echo "$(date) - Please don't kill us Mr. Travis, we are still running!" + sleep 30s +done + diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 3cabf3a59..78ec1fb22 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -255,7 +255,11 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then setrpmchangelog echo "Starting packpack..." - packpack/packpack -f utils/packpack/redhat_package.mk redhat_package + utils/packpack/heartbeat.sh & + mypid=$! + packpack/packpack -f utils/packpack/redhat_package.mk redhat_package > buildlog.txt 2>&1 + kill $mypid + cat --lines 1000 buildlog.txt # Steps common to Debian based distros elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then @@ -275,8 +279,12 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then setdebchangelog echo "Starting packpack..." - packpack/packpack - + utils/packpack/heartbeat.sh & + mypid=$! + packpack/packpack > buildlog.txt 2>&1 + kill $mypid + cat --lines 1000 buildlog.txt + if [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ] && [ "${ARCH}" == "x86_64" ] && [ "${TRAVIS}" == "true" ]; then installtrusty fi @@ -295,7 +303,11 @@ elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ] && [ "${ARCH}" == "x86 setdebchangelog echo "Starting packpack..." - packpack/packpack + utils/packpack/heartbeat.sh & + mypid=$! + packpack/packpack > buildlog.txt 2>&1 + kill $mypid + cat --lines 1000 buildlog.txt # If we are running inside Travis then attempt to install the deb we just built if [ "${TRAVIS}" == "true" ]; then diff --git a/web/skins/classic/js/jquery.js b/web/skins/classic/js/jquery.js deleted file mode 120000 index f5f467b53..000000000 --- a/web/skins/classic/js/jquery.js +++ /dev/null @@ -1 +0,0 @@ -jquery-1.11.3.js \ No newline at end of file