diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 8 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index dc8148d79..789897737 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -27,8 +27,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${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 - sudo apt-key adv --keyserver x-hkp://keys.gnupg.net --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB + echo "deb https://dl.mumble.info/mirror/mirror.mxe.cc/repos/apt xenial main" | sudo tee /etc/apt/sources.list.d/mxe.list + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 sudo apt-get -qq update sudo apt-get install \ wine \ @@ -46,8 +46,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${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 - sudo apt-key adv --keyserver x-hkp://keys.gnupg.net --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB + echo "deb https://dl.mumble.info/mirror/mirror.mxe.cc/repos/apt xenial main" | sudo tee /etc/apt/sources.list.d/mxe.list + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 sudo apt-get -qq update sudo apt-get install \ wine \ diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index eee140e71..4eddbb4fb 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -23,7 +23,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then unzip ../asiosdk2.3.zip -d ../ mv ../ASIOSDK2.3 3rdparty/asio PATH=$PATH:/usr/lib/mxe/usr/bin - export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc + export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-pc-linux-gnu/bin/protoc EXTRA_CONFIG= if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" @@ -36,7 +36,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then unzip ../asiosdk2.3.zip -d ../ mv ../ASIOSDK2.3 3rdparty/asio PATH=$PATH:/usr/lib/mxe/usr/bin - export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc + export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-pc-linux-gnu/bin/protoc EXTRA_CONFIG= if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" |