Revert Travis docker changes
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user