diff options
| author | Aleks Kissinger <aleks0@gmail.com> | 2018-10-20 13:02:10 +0200 |
|---|---|---|
| committer | Aleks Kissinger <aleks0@gmail.com> | 2018-10-20 13:02:10 +0200 |
| commit | 80e9e6f36b4032ed8e1e645ac02b0d38e3e03be2 (patch) | |
| tree | 8e46adead417b57db2e3190282de76dd1a777866 | |
| parent | 99f84f5e5c149284bb6f7efb16fb729c77c07df0 (diff) | |
turned deploy back off, added appveyor build for linux
| -rw-r--r-- | .appveyor.yml | 22 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index a53c00d..0242a99 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,23 +1,23 @@ version: '{branch}-{build}' -environment: - matrix: - # - QTDIR: C:\Qt\5.11.1\mingw53_32 - # - QTDIR: C:\Qt\5.11.1\msvc2015 - - QTDIR: C:\Qt\5.11.1\msvc2015_64 +image: + - Visual Studio 2015 + - Ubuntu configuration: - release install: - - choco install winflexbison - - '%QTDIR%\bin\qtenv2.bat' - - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - - cd C:\projects\tikzit - + - cmd: choco install winflexbison + - cmd: 'C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat' + - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 + - cmd: cd C:\projects\tikzit + - sh: sudo apt-get install flex bison + - sh: sudo apt-get install qt5-default build_script: - qmake -v - qmake - - nmake.exe + - cmd: nmake.exe + - sh: make diff --git a/.travis.yml b/.travis.yml index c7308fc..1f6853f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: env: - FILE=tikzit-osx-mountain.dmg - QTVER=56 - - DEPLOY_TIKZIT=1 + - DEPLOY_TIKZIT=0 # - os: linux # dist: trusty # env: |