chaos/VideoPlayer
1
0
Fork 0
Code Activity

Upgrade travis to bionic?

Browse source
This commit is contained in:
namedkitten 2020-05-05 15:12:14 +01:00
parent ed8548ae28
commit 949800c781
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -1,29 +1,26 @@
language: cpp language: cpp
compiler: gcc compiler: gcc
sudo: require sudo: require
dist: trusty dist: bionic
cache: cache:
ccache: true ccache: true
directories: directories:
- $HOME/.ccache - $HOME/.ccache
- $HOME/.cache/apt - $HOME/.cache/apt
#- $HOME/.cache/mpv-build
before_install: before_install:
- mkdir -p $HOME/.cache/apt/partial - mkdir -p $HOME/.cache/apt/partial
- sudo rm -rf /var/cache/apt/archives - sudo rm -rf /var/cache/apt/archives
- sudo ln -s $HOME/.cache/apt /var/cache/apt/archives - sudo ln -s $HOME/.cache/apt /var/cache/apt/archives
- sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y - sudo add-apt-repository ppa:beineri/opt-qt-5.12.6-bionic -y
- sudo apt-get update - sudo apt-get update
install: install:
- sudo apt-get -y install ccache qt510-meta-minimal qt510quickcontrols qt510quickcontrols2 qt510svg qt510x11extras qt510graphicaleffects libgl1-mesa-dev x11proto-xext-dev libx11-dev python3-setuptools - sudo apt-get -y install ccache build-essential git qt512-meta-minimal qt512quickcontrols qt512quickcontrols2 qt512svg qt512x11extras qt512graphicaleffects qt512svg libgl1-mesa-dev libmpv-dev libgl1-mesa-dev x11proto-xext-dev libx11-dev python3-setuptools
- sudo apt-get build-dep mpv - sudo apt-get build-dep mpv
- source /opt/qt*/bin/qt*-env.sh - source /opt/qt*/bin/qt*-env.sh
script: script:
- wget https://github.com/NamedKitten/mpv-builder/releases/download/continuous/deps.tar.xz
- sudo tar xvf deps.tar.xz -C /
- time bash scripts/makeappimage.sh - time bash scripts/makeappimage.sh
after_success: after_success:

5
CMakeLists.txt
View file

@ -106,9 +106,8 @@ include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}
qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras) qt5_use_modules(KittehPlayer Qml Quick Core Gui Widgets X11Extras)
if(OLD_UBUNTU) if(OLD_UBUNTU)
install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}") install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}" PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE OWNER_READ OWNER_WRITE OWNER_EXECUTE)
install (FILES "${PROJECT_NAME}-Wrapper" DESTINATION bin RENAME "${PROJECT_NAME}-bin") install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} DESTINATION bin RENAME "${PROJECT_NAME}-bin" PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE OWNER_READ OWNER_WRITE OWNER_EXECUTE)
else() else()
install (TARGETS ${PROJECT_NAME} DESTINATION bin) install (TARGETS ${PROJECT_NAME} DESTINATION bin)
endif() endif()