revert changes, try using bionic

alamminsalo · Jan 30, 2020 · b0abcac · b0abcac
1 parent c3a4105
commit b0abcac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 language: cpp
 
 matrix:
@@ -29,10 +29,10 @@ cache:
     - $HOME/mpv
 
 before_install:
-  #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:apt-fast/stable && sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get -y -qq install apt-fast; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt -y install g++; fi
-    # - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90; fi
-    # - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:apt-fast/stable && sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get -y -qq install apt-fast; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-fast -y install g++-7 > /dev/null; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew --prefix qt; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip2 install dmgbuild; fi

diff --git a/ci/build_mpv.sh b/ci/build_mpv.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e -x
 
-sudo apt -y install nasm xorg-dev libwayland-dev libgl1-mesa-dev libegl1-mesa-dev fontconfig libfribidi-dev yasm libxinerama-dev libxrandr-dev libasound2-dev libpulse-dev libjack-dev libvdpau-dev libva-dev libva-egl1 libva-x11-1 libva1 > /dev/null
+sudo apt-fast -y install nasm xorg-dev libwayland-dev libgl1-mesa-dev libegl1-mesa-dev fontconfig libfribidi-dev yasm libxinerama-dev libxrandr-dev libasound2-dev libpulse-dev libjack-dev libvdpau-dev libva-dev libva-egl1 libva-x11-1 libva1 > /dev/null
 #vulkan
-sudo apt -y install libassimp-dev libglm-dev graphviz libxcb-dri3-0 libxcb-present0 libpciaccess0 cmake libpng-dev libxcb-dri3-dev libx11-dev libx11-xcb-dev libmirclient-dev libwayland-dev libxrandr-dev
+sudo apt-fast -y install libassimp-dev libglm-dev graphviz libxcb-dri3-0 libxcb-present0 libpciaccess0 cmake libpng-dev libxcb-dri3-dev libx11-dev libx11-xcb-dev libmirclient-dev libwayland-dev libxrandr-dev
 
 cd $HOME
 wget -O vulkansdk-linux-x86_64-1.0.51.0.run https://vulkan.lunarg.com/sdk/download/1.0.51.0/linux/vulkansdk-linux-x86_64-1.0.51.0.run
@@ -38,4 +38,4 @@ fi
 
 sudo ln -sf $MPV_DIR/include/mpv /usr/include/mpv
 sudo ln -sf $MPV_DIR/libmpv.so /usr/lib/libmpv.so
-sudo ln -sf $MPV_DIR/libmpv.so /usr/lib/libmpv.so.1
+sudo ln -sf $MPV_DIR/libmpv.so /usr/lib/libmpv.so.1
diff --git a/ci/install_qt5.sh b/ci/install_qt5.sh
@@ -10,7 +10,7 @@ cd $HOME/Qt
 export QT_VERSION=$1
 ENVFILE=qt-${QT_VERSION}.env
 
-sudo apt -y install axel libssl-dev libssl1.0.0 > /dev/null
+sudo apt-fast -y install axel libssl-dev libssl1.0.0 > /dev/null
 
 if [[ ! -f ./${ENVFILE} ]]; then
     wget -q https://raw.githubusercontent.com/mrgreywater/qtci/master/bin/extract-qt-installer

diff --git a/ci/prepare_android.sh b/ci/prepare_android.sh
@@ -13,7 +13,7 @@ export PACKAGES=platform-tool,build-tools-22.0.1,android-19
 
 mkdir -p $ANDROID_DIR  && cd $ANDROID_DIR 
 
-sudo apt install -y p7zip openjdk-7-jdk ant lib32z1-dev lib32stdc++6 > /dev/null
+sudo apt-fast install -y p7zip openjdk-7-jdk ant lib32z1-dev lib32stdc++6 > /dev/null
 sudo update-alternatives --display java
 sudo update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
 
@@ -32,4 +32,4 @@ export QTDIR=$HOME/Qt/5.10.1/android_armv7
 export PATH=$QTDIR/bin:$PWD/android-sdk-linux/tools:$PATH
 export ANDROID_NDK_ROOT=$PWD/android-ndk-${NDK_VERSION}
 export ANDROID_SDK_ROOT=$PWD/android-sdk-linux
-EOM
+EOM