Update CI config

Author: tstenner

.appveyor.yml

@@ -1,67 +1,28 @@
-#: # Appveyor configuration ([source](../appskeleton/appveyor.yml))
-#: The AppVeyor configuration tells AppVeyor how to build the app.
-#: See the [AppVeyor documentation](https://www.appveyor.com/docs/appveyor-yml/)
-#: for specific questions.
-#: 
-#: If you use this skeleton, you should only need to edit the following keys:
-#: - `version`: the package version
-#: - `deploy.username`: your username, even if you commit to the official repository
-#: - `deploy.api_key.secure`: your *encrypted* API key. Use the
-#:   [encryption utility](https://ci.appveyor.com/tools/encrypt) to encrypt it.
 version: 1.13.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 shallow_clone: true
-#: ## Environment variables
-#:
-#: Variables (`VAR`) defined here can be used in the build scripts (Windows: `%VAR%`, Linux: `${VAR}`).
-#: 
-#: They can also be overridden in the build tool (`ci_console.html` in your local
-#: labstreaminglayer/labstreaminglayer repo) to build with a special configuration.
-#: 
-#: each subgroup in `environment.matrix` will start a separate, clean build with the
-#: environment variables. This is useful in building on different operating systems
-#: (different `APPVEYOR_BUILD_WORKER_IMAGE`s) or compiler versions (i.e. through `VCVER`)
 environment:
-  lsltag: 1.13.0-b12
+  lsltag: 1.13.0
   lslversion: 1.13.0
   LSLDIST_URL: "https://github.com/sccn/liblsl/releases/download"
   CMakeArgs: ""
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      QTCOMPILER: msvc2017_64
-      QTVER: 5.12
-    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
-      DEPLOYNAME: Linux64-xenial
-#: # The `install` section
-#: 
-#: List everything here to prepare the (clean) build server.
-#: 
-#: Everything prefixed with `- cmd:` is only executed on windows,
-#: `- sh:` on Linux.
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    QTCOMPILER: msvc2017_64
+    QTVER: 5.13
+  - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
+    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%/%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
+- cmd: appveyor DownloadFile %LSLDIST_URL%/%lsltag%/liblsl-%lslversion%-Win64.zip -FileName liblsl_x64.zip
+- cmd: 7z x liblsl_x64.zip -oLSL
 - sh: wget ${LSLDIST_URL}/${lsltag}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
-- sh: dpkg -x lsl.deb LSL
+- sh: sudo dpkg -i lsl.deb
 - sh: sudo apt update && sudo apt install -y qtbase5-dev
 build_script:
-- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-- 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
-- cmake --build . --config Release --target install
-- cpack -C Release
-#: ## Artifacts
-#: 
-#: If you want the built binaries in addition to the build log, you can define
-#: which paths (`path`) get compressed to which archives (`name`). You can use
-#: environment variables as placeholders (`$(lslversion)`).
+- cmd: cmake -S . -B build -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% -A x64
+- sh: cmake -S . -B build -DLSL_UNIXFOLDERS=1 -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=1 ${CMakeArgs}
+- cmake --build build --config Release -j --target package
 artifacts:
 - path: 'build/*.deb'
 - path: 'build/*.tar.*'

.github/workflows/cppcmake.yml

@@ -56,12 +56,11 @@ jobs:
     - name: Configure CMake
       shell: bash
       run: |
-           cmake --version
-           cmake -E make_directory build
-           cd build
-           cmake -DLSL_INSTALL_ROOT=$PWD/../ -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON ..
+           cmake -S . -B build -DLSL_INSTALL_ROOT=$PWD/LSL/ -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON -DCPACK_DEBIAN_PACKAGE_DEPENDS=1
     - name: make
-      run: cmake --build build --config Release -j --target package
+      run: cmake --build build --config Release -j
+    - name: package
+      run: cmake --build build --config Release -j --target install
     - uses: actions/upload-artifact@master
       with:
         name: pkg-${{ matrix.os }}

.travis.yml

@@ -1,35 +1,11 @@
-#: # `.travis.yml` ([source](../appskeleton/.travis.yml))
-#:
-#: `.travis.yml` tells [TravisCI](https://travis-ci.com) how to build the app.
-#: 
-#: See the [TravisCI help pages](https://docs.travis-ci.com/).
-#: 
-#: If you use this skeleton, you should only need to edit the following keys:
-#: - `matrix.include.os.addons.apt.packages`: additional packages required
-#:   (e.g. `qt5-default` for Qt, `libboost-XY-dev` for Boost.XY)
-#: - `matrix.include.os.before_install` for OS X packages
-#: - deployment information. See [Deployment](#deployment).
-#:
-#: ## Basic configuration
-#:
-#: We compile with clang because it produces better error messages and is faster.
 language: cpp
 dist: xenial
 compiler: clang
-#: The build environment variables.
-#: They can also be overridden in the build tool (`ci_console.html` in your local
-#: labstreaminglayer/labstreaminglayer repo) to build with a special configuration.
 env:
   LSLDIST_URL="https://github.com/sccn/liblsl/releases/download"
   UBUNTU_DIST="xenial"
-  LSL_VERSION="1.13.0-b12"
+  LSL_VERSION="1.13.0"
   - CMakeArgs=""
-#: ## Build environment setup
-#:
-#: Linux builds aren't enabled on Travis because the experience on Appveyor and
-#: Azure Pipelines is way better.
-#:
-#: On OS X, install packages via `brew` and download and extract liblsl.
 matrix:
   include:
   - os: osx
@@ -42,10 +18,6 @@ matrix:
     - export LSL_INSTALL_ROOT=LSL
     - brew install qt
     - export CMAKE_PREFIX_PATH=/usr/local/opt/qt/
-#: ## `script` section
-#:
-#: Steps to build the app, copy the binaries to an "installation" folder and
-#: create `.dmg` packages on OS X and `.deb` packages on Linux.
 script:
 - mkdir -p build/install
 - cd build