CI: update config

Author: tstenner

.appveyor.yml

@@ -3,7 +3,8 @@ pull_requests:
   do_not_increment_build_number: true
 shallow_clone: true
 environment:
-  lslversion: 1.13.0-b4
+  lsltag: 1.13.0-b12
+  lslversion: 1.13.0
   LSLDIST_URL: "https://github.com/sccn/liblsl/releases/download"
   CMakeArgs: ""
   matrix:
@@ -14,23 +15,22 @@ environment:
       DEPLOYNAME: Linux64-bionic
 install:
 - cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -FileName ninja.zip
-- cmd: appveyor DownloadFile %LSLDIST_URL%/%lslversion%/liblsl-%lslversion%-Win64.7z -FileName liblsl_x64.7z
-- cmd: 7z x ninja.zip -oC:\projects\deps\ninja > nul
-- cmd: 7z x liblsl_x64.7z
-- cmd: set PATH=C:\projects\deps\ninja;%PATH%
+- cmd: appveyor DownloadFile %LSLDIST_URL%/%lsltag%/liblsl-%lslversion%-Win64.7z -FileName liblsl_x64.7z
+- cmd: 7z x ninja.zip
+- cmd: set PATH=%cd%;%PATH%
+- cmd: 7z x liblsl_x64.7z -oLSL
 - cmd: ninja --version
 - sh: set -x
-- sh: wget ${LSLDIST_URL}/${lslversion}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
+- sh: wget ${LSLDIST_URL}/${lsltag}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
 - sh: dpkg -x lsl.deb LSL
 - sh: sudo apt update && sudo apt install -y qtbase5-dev libboost-system-dev
 build_script:
 - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-- mkdir build
+- cmd: cmake -S . -B build -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs%
+- sh: cmake -S . -B build -DLSL_INSTALL_ROOT=LSL/usr -DLSL_UNIXFOLDERS=1 ${CMakeArgs}
 - cd build
-- cmd: cmake -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% ../
-- sh: cmake -DLSL_INSTALL_ROOT=LSL/usr -DLSL_UNIXFOLDERS=1 ${CMakeArgs} ..
 - cmake --build . --config Release --target install
-- cpack
+- cpack -C Release
 artifacts:
 - path: 'build/*.deb'
 - path: 'build/*.tar.*'

.travis.yml

@@ -4,15 +4,15 @@ compiler: clang
 env:
   LSLDIST_URL="https://github.com/sccn/liblsl/releases/download"
   UBUNTU_DIST="xenial"
-  LSL_VERSION="1.13.0-b9"
-  OSXVER=MacOS10.13
+  LSL_VERSION="1.13.0-b12"
+  OSXVER=OSX64
   - CMakeArgs=""
 matrix:
   include:
   - os: osx
     osx_image: xcode10.1
     before_script:
-    - travis_retry wget ${LSLDIST_URL}/${LSL_VERSION}/liblsl-${LSL_VERSION}-${OSXVER}.tar.bz2
+    - travis_retry wget ${LSLDIST_URL}/${LSL_VERSION}/liblsl-1.13.0-OSX64.tar.bz2
     - mkdir LSL; tar -xf *.tar.bz2 -C LSL
     - export LSL_INSTALL_ROOT=LSL
     - brew install qt