Skip to content

Commit

Permalink
Merge pull request #97 from labstreaminglayer/cboulay/update_liblsl
Browse files Browse the repository at this point in the history
Update liblsl to 1.16.2
  • Loading branch information
cboulay authored May 28, 2023
2 parents 3229a7a + 8ff92f8 commit d52f02a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/cppcmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
types: ['created']

env:
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.16.0/'
LSL_RELEASE: '1.16.0'
LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download'
LSL_RELEASE: '1.16.2'

defaults:
run:
Expand All @@ -33,9 +33,6 @@ jobs:
os: "ubuntu-22.04"
- name: "ubuntu-20.04"
os: "ubuntu-20.04"
- name: "ubuntu-18.04"
os: "ubuntu-18.04"
qt_ver: "5.12.12"
- name: "windows-x64"
os: "windows-latest"
cmake_extra: "-T v142,host=x86"
Expand All @@ -48,30 +45,30 @@ jobs:
arch: "i386"
qt_arch: "win32_msvc2019"
qt_ver: "5.15.2"
- name: "macOS-10"
os: "macos-10.15"
- name: "macOS-latest"
os: "macOS-latest"
steps:
- uses: actions/checkout@v3

- name: Install liblsl (Ubuntu)
if: startsWith(matrix.config.os, 'ubuntu-')
run: |
sudo apt install -y libpugixml-dev
curl -L ${LSL_RELEASE_URL}/liblsl-${LSL_RELEASE}-$(lsb_release -sc)_amd64.deb -o liblsl.deb
curl -L ${LSL_RELEASE_URL}/v${LSL_RELEASE}/liblsl-${LSL_RELEASE}-$(lsb_release -sc)_amd64.deb -o liblsl.deb
sudo apt install ./liblsl.deb
- name: Download liblsl (Windows)
if: matrix.config.os == 'windows-latest'
run: |
curl -L ${LSL_RELEASE_URL}/liblsl-${LSL_RELEASE}-Win_${{ matrix.config.arch}}.zip -o liblsl.zip
curl -L ${LSL_RELEASE_URL}/v${LSL_RELEASE}/liblsl-${LSL_RELEASE}-Win_${{ matrix.config.arch}}.zip -o liblsl.zip
7z x liblsl.zip -oLSL
- name: Download liblsl (macOS)
if: startsWith(matrix.config.os, 'macos-')
run: brew install labstreaminglayer/tap/lsl

- name: Install Qt (Window and Ubuntu bionic)
if: (matrix.config.os == 'windows-latest') || (matrix.config.os == 'ubuntu-18.04')
- name: Install Qt (Window)
if: (matrix.config.os == 'windows-latest')
uses: jurplel/[email protected]
with:
version: ${{ matrix.config.qt_ver }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project(LabRecorder
DESCRIPTION "Record and write LabStreamingLayer streams to an XDF file"
HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/"
LANGUAGES C CXX
VERSION 1.16.3)
VERSION 1.16.4)

# Needed for customized MacOSXBundleInfo.plist.in
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH})
Expand Down

0 comments on commit d52f02a

Please sign in to comment.