Revert Travis docker changes

This commit is contained in:
Lukas W
2017-10-20 10:54:24 +02:00
parent 307deaef4c
commit ff958338e7
22 changed files with 130 additions and 163 deletions

View File

@@ -1,11 +1,10 @@
language: cpp
compiler: gcc
services:
- docker
dist: trusty
sudo: required
cache:
directories:
- apt_mingw_cache
- $HOME/.ccache
matrix:
include:
@@ -15,11 +14,14 @@ matrix:
- os: osx
osx_image: xcode8.2
- env: QT5=True
- env: QT5=True TARGET_OS=win32
- env: QT5=True TARGET_OS=win64
- os: osx
env: QT5=True
install: ${TRAVIS_BUILD_DIR}/.travis/install.sh
script: ${TRAVIS_BUILD_DIR}/.travis/script.sh
after_script: ${TRAVIS_BUILD_DIR}/.travis/after_script.sh
before_deploy: make package
deploy:
provider: releases
api_key:
@@ -29,5 +31,5 @@ deploy:
on:
tags: true
all_branches: true
condition: '("$TARGET_OS" = win??)'
condition: '("$TARGET_OS" = win??) && "$QT5"'
repo: LMMS/lmms