StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(travis): revert 8e597ed736

Browse Source 
https://github.com/qTox/qTox/pull/5866 both updated our travis xcode version,
and also added the dots in 8e597ed736. When macOS
was updated by Apple, older versions aged out of support, and brew also stopped
supporting them. Our travis xcode9.2 at the time stopped getting binary
packages (kegs) from brew because of that, and started having to compile
packages which is what was causing the timeouts.

Updating our xcode version allowed us to get binary packages from brew again,
so the workaround of constant output to avoid timing out while compiling large
packages is no longer needed.
This commit is contained in:
Anthony Bilinski 2020-08-18 14:53:07 -07:00
parent 1d1d2b26af
commit db1397d69c
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osx/qTox-Mac-Deployer-ULTIMATE.sh
View File

@ -189,23 +189,7 @@ install() {
# needed for kf5-sonnet # needed for kf5-sonnet
brew tap kde-mac/kde https://invent.kde.org/packaging/homebrew-kde.git brew tap kde-mac/kde https://invent.kde.org/packaging/homebrew-kde.git
# brew install qt5 might take a long time to build Qt. Travis kills us if
# we don't output for 10 minutes. Travis also kills us if we output too much,
# so verbose isn't an option. So just output some dots...
if [[ $TRAVIS = true ]]
then
echo "outputting dots to keep travis from killing us..."
while true; do
echo -n "."
sleep 10
done &
DOT_PID=$!
fi
brew install ffmpeg libexif qrencode qt5 sqlcipher openal-soft #kf5-sonnet brew install ffmpeg libexif qrencode qt5 sqlcipher openal-soft #kf5-sonnet
if [[ $TRAVIS = true ]]
then
kill $DOT_PID
fi
QT_VER=($(ls ${QT_DIR} | sed -n -e 's/^\([0-9]*\.([0-9]*\.([0-9]*\).*/\1/' -e '1p;$p')) QT_VER=($(ls ${QT_DIR} | sed -n -e 's/^\([0-9]*\.([0-9]*\.([0-9]*\).*/\1/' -e '1p;$p'))
QT_DIR_VER="${QT_DIR}/${QT_VER[1]}" QT_DIR_VER="${QT_DIR}/${QT_VER[1]}"