travis-ci: remove Qt 4 configurations

mumble-voip · Feb 19, 2019 · 8c9f858 · 8c9f858
1 parent 50fff9b
commit 8c9f858
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,6 @@ os:
   - osx
 
 env:
-  - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu
-  - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
   - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu
   - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
   - MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32
@@ -19,19 +17,15 @@ env:
 matrix:
   exclude:
     - os: linux
-      env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin
+      env: MUMBLE_HOST=x86_64-apple-darwin
     - os: osx
-      env: MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu
+      env: MUMBLE_HOST=x86_64-linux-gnu
     - os: osx
-      env: MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
+      env: MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
     - os: osx
-      env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu
+      env: MUMBLE_HOST=i686-w64-mingw32
     - os: osx
-      env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
-    - os: osx
-      env: MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32
-    - os: osx
-      env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32
+      env: MUMBLE_HOST=x86_64-w64-mingw32
 
 before_install:
     - ./scripts/travis-ci/before_install.bash

diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash
@@ -15,16 +15,12 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 	# See mumble-voip/mumble#3312 for more information.
 	echo 'Acquire::http::Timeout "120";' | sudo tee /etc/apt/apt.conf.d/99zzztimeout
 
-	if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
-		sudo apt-get -qq update
-		sudo apt-get build-dep -qq mumble
-		sudo apt-get install libjack-jackd2-dev
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
+	if [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
 		sudo apt-get -qq update
 		sudo apt-get build-dep -qq mumble
 		sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools qttranslations5-l10n libqt5svg5-dev
 		sudo apt-get install libjack-jackd2-dev
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
 		sudo dpkg --add-architecture i386
 		sudo apt-get -qq update
 		echo "deb https://dl.mumble.info/mirror/pkg.mxe.cc/repos/apt/debian jessie main" | sudo tee /etc/apt/sources.list.d/mxeapt.list
@@ -43,7 +39,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 			mxe-${MUMBLE_HOST_DEB}.static-ogg \
 			mxe-${MUMBLE_HOST_DEB}.static-vorbis \
 			mxe-${MUMBLE_HOST_DEB}.static-libsndfile
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
 		sudo dpkg --add-architecture i386
 		sudo apt-get -qq update
 		echo "deb https://dl.mumble.info/mirror/pkg.mxe.cc/repos/apt/debian jessie main" | sudo tee /etc/apt/sources.list.d/mxeapt.list

diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash
@@ -6,19 +6,13 @@
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-	if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
-		EXTRA_CONFIG=
-		if [ "${MUMBLE_NO_PCH}" == "1" ]; then
-			EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}"
-		fi
-		qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive && make -j2 && make check
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
+	if [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
 		EXTRA_CONFIG=
 		if [ "${MUMBLE_NO_PCH}" == "1" ]; then
 			EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}"
 		fi
 		qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" -recursive && make -j2 && make check
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
 		wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../
 		unzip ../asiosdk2.3.zip -d ../
 		mv ../ASIOSDK2.3 3rdparty/asio
@@ -31,7 +25,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 		${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors g15-emulator no-overlay no-bonjour no-elevation no-ice ${EXTRA_CONFIG}"
 		make -j2
 		make check TESTRUNNER="wine"
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
 		wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../
 		unzip ../asiosdk2.3.zip -d ../
 		mv ../ASIOSDK2.3 3rdparty/asio