CI: update config for upcoming liblsl 1.13

Author: tstenner

.appveyor.yml

@@ -3,28 +3,27 @@ pull_requests:
   do_not_increment_build_number: true
 shallow_clone: true
 environment:
-  lslversion: 1.13.0
-  DODEPLOY: false
-  LSLDIST_URL: "https://dl.bintray.com/labstreaminglayer/LSL"
+  lslversion: 1.13.0-b3
+  LSLDIST_URL: "https://github.com/sccn/liblsl/releases/download"
   CMakeArgs: ""
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      VCVER: 14.0
-      QTCOMPILER: msvc2015_64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      VCVER: 14.1
+      QTCOMPILER: msvc2017_64
       QTVER: 5.11
       ARCH: x64
       DEPLOYNAME: Win64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
-      DEPLOYNAME: Linux64-xenial
+    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
+      DEPLOYNAME: Linux64-bionic
 install:
 - cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip -FileName ninja.zip
-- cmd: appveyor DownloadFile %LSLDIST_URL%/liblsl-%lslversion%-Win64-MSVC%VCVER%.7z -FileName liblsl_x64.7z
+- 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: ninja --version
 - sh: set -x
-- sh: wget ${LSLDIST_URL}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
+- sh: wget ${LSLDIST_URL}/${lslversion}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
 - sh: dpkg -x lsl.deb LSL
 - sh: sudo apt update && sudo apt install -y qtbase5-dev
 build_script:
@@ -38,18 +37,4 @@ build_script:
 artifacts:
 - path: 'build/*.deb'
 - path: 'build/*.tar.*'
-- path: build/install
-  name: ${APPVEYOR_PROJECT_NAME}_${lslversion}-${DEPLOYNAME}
-deploy:
-- provider: BinTray
-  username: tstenner
-  api_key:
-    secure: Fo9tIQnGjVnCXB3euItvYrt85A5O9FPqq7LEpsdOuwW+eOg1rwA5Q1HLp4yWDXAl
-  subject: labstreaminglayer
-  version: $(lslversion)
-  repo: LSL
-  package: $(APPVEYOR_PROJECT_NAME)
-  publish: true
-  override: true
-  on:
-    DODEPLOY: true
+- path: 'build/*.7z'

.travis.yml

@@ -2,19 +2,10 @@ language: cpp
 dist: xenial
 compiler: clang
 env:
-  LSLDIST_URL="https://dl.bintray.com/labstreaminglayer/LSL"
-  UBUNTU_DIST="trusty"
-  LSL_VERSION="1.13.0"
+  LSLDIST_URL="https://github.com/sccn/liblsl/releases/download/"
+  UBUNTU_DIST="xenial"
+  LSL_VERSION="1.13.0-b3"
   - CMakeArgs=""
-script:
-- mkdir -p build/install
-- cd build
-- cmake --version
-- cmake -DLSL_INSTALL_ROOT=${LSL_INSTALL_ROOT} $CMakeArgs ../
-- cmake --build . --config Release --target install
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then for app in *.app; do ${CMAKE_PREFIX_PATH}/bin/macdeployqt ${app} -dmg; mv "${app%.app}.dmg" "${app%.app}-${LSL_VERSION}-OSX64.dmg}"; done; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack; fi
-- cd ..
 matrix:
   include:
 #    - os: linux
@@ -32,13 +23,15 @@ matrix:
       - brew install qt
       - export CMAKE_PREFIX_PATH=/usr/local/opt/qt/
       before_script:
-      - travis_retry wget ${LSLDIST_URL}/liblsl-${LSL_VERSION}-OSX64.tar.bz2
+      - travis_retry wget ${LSLDIST_URL}/${LSL_VERSION}/liblsl-${LSL_VERSION}-OSX64.tar.bz2
       - mkdir LSL; tar -xf *.tar.bz2 -C LSL
       - export LSL_INSTALL_ROOT=LSL
-deploy:
-  skip_cleanup: true
-  provider: bintray
-  user: tstenner
-  key:
-    secure: "LWOE+Vmi/cWCpmg56L/fLzd9EReLnXM+RcLG/FxpycGSEniQawxDU0sU+bQDf10DtG41Xc6TRKhnbphoVSgjM6s9eAGdG+is1QxoCZMYdI4neefr6hLWiBXFPinQiWcHbEeqCCaSTH+AGqqdLP2UpGuRAy4aeJogBkvtfmX4+jLLUlmZwxEqElPkS32jZo5W6jrbH8bw0WxCy7UBV0UMki0mDmp+sJr3fWEDdL/IUR2jBAOMqwvUGqBMWMB4l+LX7DaFW7ASjpXIw+J0hKcZSixJwzkndiHyUDb0aEdyaOwh8vSOJaBHZS4i7+BJsn3Y6itYglCViV1FEGLoZkmYG9UiKhw62nny1OcOCXuGX/0CSXYvEN/n2weL/OxGjO76QovwpGC+Njh2yVTB4k9V4LAixtxZYn2UVktuIF+GJkwviWTn7xyzdftqRGVS1t0N9PxoxljWKDZR7ocBkiyyJsINRx0a7NaUksOzWq5O5sgb8nBU8bsEJzGsmkaZeZZAnDiiUb56o4KDxG+Ql73rgmxzH2lRjV79cQoOJmo85Iz4CarNbLv5ZBoIN7HcDjmUwYS9bsJYE03OmTeZYVCle/pBOfRK60C2NKNAT+rJAqt1ihYy+aqT5A/3YnGJbwPDT9ekViziD7Ojche+nI1CYegD6sg9jD1xwExkczu+Eqo="
-  file: .bintray.json
+script:
+- mkdir -p build/install
+- cd build
+- cmake --version
+- cmake -DLSL_INSTALL_ROOT=${LSL_INSTALL_ROOT} $CMakeArgs ../
+- cmake --build . --config Release --target install
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then for app in *.app; do ${CMAKE_PREFIX_PATH}/bin/macdeployqt ${app} -dmg; mv "${app%.app}.dmg" "${app%.app}-${LSL_VERSION}-OSX64.dmg}"; done; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack; fi
+- cd ..