Ongoing travis fix PR (#291)

* try using qt brew package, add info qt command * use brew link * Revert "use brew link" This reverts commit d91c942. * use brew prefix to set qtpath * check what prefix qt prints * use qtdir once again * drop failing ppa installations * use plain wget * Revert "use plain wget" This reverts commit 3d9a14e. * revert changes, try using bionic * try using xenial * Revert "try using xenial" This reverts commit 8f6892f. * add mesa-common-dev * add qt5-default to get needed libs * use xenial as it got close; try using newer appimage * openjdk 8 * linuxdeployqt version * add libgstreamer-plugins-base1.0-0 * disable apk creation for now
alamminsalo · Jan 30, 2020 · f2a2c40 · f2a2c40
1 parent f8a2b57
commit f2a2c40
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 language: cpp
 
 matrix:
@@ -16,11 +16,11 @@ matrix:
         - BACKEND=mpv
       compiler: gcc
 
-    - os: linux
-      env:
-        - PLATFORM=android
-        - BACKEND=multimedia
-      compiler: gcc
+      #- os: linux
+      #  env:
+      #    - PLATFORM=android
+      #    - BACKEND=multimedia
+      #  compiler: gcc
 
 cache:
   apt: true
@@ -33,7 +33,8 @@ before_install:
   - 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 qt5 jq; 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
 
 install:
@@ -53,7 +54,7 @@ deploy:
       file: 
         - 'artifacts/orion-$PLATFORM-$TRAVIS_TAG.dmg'
         - 'artifacts/orion-$PLATFORM-$TRAVIS_TAG.AppImage'
-        - 'artifacts/orion-$PLATFORM-$TRAVIS_TAG.apk'
+          #- 'artifacts/orion-$PLATFORM-$TRAVIS_TAG.apk'
       skip_cleanup: true
       prerelease: true
       on:

diff --git a/ci/build_mpv.sh b/ci/build_mpv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e -x
 
-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
+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 libgstreamer-plugins-base1.0-0 > /dev/null
 #vulkan
 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
 
@@ -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/deploy_linux.sh b/ci/deploy_linux.sh
@@ -3,9 +3,9 @@ set -e -x
 ARTIFACTS=$1
 
 # deploy
-wget -q https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage -O linuxdeployqt.AppImage
+wget -q https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage -O linuxdeployqt.AppImage
 chmod a+x linuxdeployqt.AppImage 
 cp -f distfiles/Orion.desktop Orion.desktop
 cp -f distfiles/orion.svg orion.svg
 ./linuxdeployqt.AppImage distfiles/Orion.desktop -qmldir=./src/qml -qmake=$QTDIR/bin/qmake -appimage -bundle-non-qt-libs -verbose=1
-mv *-x86_64.AppImage $ARTIFACTS/orion-$PLATFORM-$TRAVIS_TAG.AppImage
+mv *-x86_64.AppImage $ARTIFACTS/orion-$PLATFORM-$TRAVIS_TAG.AppImage
diff --git a/ci/prepare_android.sh b/ci/prepare_android.sh
@@ -13,9 +13,9 @@ export PACKAGES=platform-tool,build-tools-22.0.1,android-19
 
 mkdir -p $ANDROID_DIR  && cd $ANDROID_DIR 
 
-sudo apt-fast install -y p7zip openjdk-7-jdk ant lib32z1-dev lib32stdc++6 > /dev/null
+sudo apt-fast install -y p7zip openjdk-8-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
+sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
 
 wget -q https://raw.githubusercontent.com/benlau/qtci/master/bin/install-android-sdk
 chmod +x install-android-sdk
@@ -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
diff --git a/ci/prepare_osx.sh b/ci/prepare_osx.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 cat << EOM > ci/osx.env
-export QTDIR=$(brew info --json=v1 qt | jq -r '.[0].bottle.stable.cellar + "/" + .[0].name + "/" + .[0].installed[0].version')
+export QTDIR=$(brew --prefix qt)
 export PATH=$QTDIR/bin:$PATH
 EOM
diff --git a/orion.pro b/orion.pro
@@ -17,7 +17,7 @@ isEmpty(PREFIX){
     PREFIX = /usr
 }
 
-VERSION = 1.6.6
+VERSION = 1.6.7
 DEFINES += APP_VERSION=\\\"v$$VERSION\\\"
 DEFINES += APP_NAME=\\\"Orion\\\"