From 750483854ceb37ff083523d9b90ee9fbbe2456df Mon Sep 17 00:00:00 2001 From: Chadwick Boulay Date: Sat, 23 Apr 2022 00:41:54 -0400 Subject: [PATCH 1/2] Bump liblsl version to 1.16.0 --- .github/workflows/cppcmake.yml | 4 ++-- CMakeLists.txt | 2 +- xdfwriter/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index 4843ee6..bccb554 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -12,8 +12,8 @@ on: types: ['created'] env: - LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.14.1b9' - LSL_RELEASE: '1.14.1' + LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download/v1.16.0/' + LSL_RELEASE: '1.16.0' defaults: run: diff --git a/CMakeLists.txt b/CMakeLists.txt index 555f33d..14c8e8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.14.2) + VERSION 1.16.0) # Needed for customized MacOSXBundleInfo.plist.in SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH}) diff --git a/xdfwriter/CMakeLists.txt b/xdfwriter/CMakeLists.txt index 8b7fa15..039b5ef 100644 --- a/xdfwriter/CMakeLists.txt +++ b/xdfwriter/CMakeLists.txt @@ -4,7 +4,7 @@ project(xdfwriter DESCRIPTION "C++ library for writing XDF files" HOMEPAGE_URL "https://github.com/labstreaminglayer/App-LabRecorder/" LANGUAGES C CXX - VERSION 1.14.1) + VERSION 1.16.0) option(LABRECORDER_XDFZ "use Boost.Iostreams for XDFZ support" Off) option(LABRECORDER_BOOST_TYPE_CONVERSIONS "Use boost for type conversions" Off) From c97c65aca02fbc3cdfce4c72a248890f0db012fb Mon Sep 17 00:00:00 2001 From: Chadwick Boulay Date: Sat, 23 Apr 2022 00:57:57 -0400 Subject: [PATCH 2/2] Bump Qt versions in GH actions --- .github/workflows/cppcmake.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml index bccb554..4964055 100644 --- a/.github/workflows/cppcmake.yml +++ b/.github/workflows/cppcmake.yml @@ -30,14 +30,16 @@ jobs: config: - name: "ubuntu-20.04" os: "ubuntu-20.04" + qt_ver: "6.3.0" - 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" arch: "amd64" qt_arch: "win64_msvc2019_64" - qt_ver: "6.1.0" + qt_ver: "6.3.0" - name: "windows-x86" os: "windows-latest" cmake_extra: "-T v142,host=x86 -A Win32" @@ -46,7 +48,7 @@ jobs: qt_ver: "5.15.2" - name: "macOS-10" os: "macos-10.15" - qt_ver: "6.1.0" + qt_ver: "6.3.0" steps: - uses: actions/checkout@v2 @@ -67,13 +69,8 @@ jobs: if: startsWith(matrix.config.os, 'macos-') run: brew install labstreaminglayer/tap/lsl - - name: Install Qt .deb packages - if: startsWith(matrix.config.os, 'ubuntu-') - run: sudo apt install -y qtbase5-dev - - - name: Install Qt (Win and Mac) - if: startsWith(matrix.config.os, 'windows') || startsWith(matrix.config.os, 'macos') - uses: jurplel/install-qt-action@v2.12.2 + - name: Install Qt + uses: jurplel/install-qt-action@v2.14.0 with: version: ${{ matrix.config.qt_ver }} arch: ${{ matrix.config.qt_arch }}