From dc0d0e068922d43faed27a4027cc3a5bfcb6f094 Mon Sep 17 00:00:00 2001
From: Tristan Stenner <ttstenner@gmail.com>
Date: Wed, 16 Sep 2020 09:59:16 +0200
Subject: [PATCH 1/3] Update liblsl binary

---
 .github/workflows/cppcmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml
index ac1a689..3055fa9 100644
--- a/.github/workflows/cppcmake.yml
+++ b/.github/workflows/cppcmake.yml
@@ -12,7 +12,7 @@ env:
   LSL_URL: 'https://github.com/sccn/liblsl/releases/download'
   LSL_RELEASE_PREFIX: 'v'
   LSL_RELEASE: '1.14.0'
-  LSL_RELEASE_SUFFIX: 'b1'
+  LSL_RELEASE_SUFFIX: 'b4'
 
 
 jobs:

From 6b54799b169030797cb5e461f009a169e49a6b15 Mon Sep 17 00:00:00 2001
From: Tristan Stenner <ttstenner@gmail.com>
Date: Wed, 16 Sep 2020 09:59:39 +0200
Subject: [PATCH 2/3] CI: Remove Qt workaround, update to LTS version on
 Windows

---
 .github/workflows/cppcmake.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml
index 3055fa9..26d22e9 100644
--- a/.github/workflows/cppcmake.yml
+++ b/.github/workflows/cppcmake.yml
@@ -58,10 +58,9 @@ jobs:
 
     - name: Install Qt
       if: matrix.os == 'windows-latest'
-      # uses: jurplel/install-qt-action@v2
-      uses: ouuan/install-qt-action@v2.3.1 # workaround until the aqtinstall timeout is fixed
+      uses: jurplel/install-qt-action@v2
       with:
-        version: 5.14.0
+        version: 5.15.1
 
     - name: Configure CMake
       shell: bash

From 50b01a7d59a21cca60fc144b303de365ce5ee8ca Mon Sep 17 00:00:00 2001
From: Tristan Stenner <ttstenner@gmail.com>
Date: Wed, 16 Sep 2020 10:00:03 +0200
Subject: [PATCH 3/3] CI: Update to Github Actions actions with glob support

---
 .github/workflows/cppcmake.yml | 52 +++++++---------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/cppcmake.yml b/.github/workflows/cppcmake.yml
index 26d22e9..09f4d01 100644
--- a/.github/workflows/cppcmake.yml
+++ b/.github/workflows/cppcmake.yml
@@ -76,55 +76,27 @@ jobs:
     - name: Package
       run: cmake --build build --config Release -j --target package
       
-    # TODO: upload-artifact@v2 (in-progress) will support file glob
-    - name: Upload Artifacts (ubuntu)
-      if: matrix.os == 'ubuntu-latest'
-      uses: actions/upload-artifact@master
-      with:
-        name: pkg-${{ matrix.os }}
-        path: build/AppTemplate_cpp_qt-1.13.0-Linux64-bionic.deb
-    
-    - name: Upload Artifacts (macOS)
-      if: matrix.os == 'macOS-latest'
-      uses: actions/upload-artifact@master
-      with:
-        name: pkg-${{ matrix.os }}
-        path: build/AppTemplate_cpp_qt-1.13.0-OSX64.tar.bz2
-
     # TODO: Can reconstruct filename from project name and version in CMakeCache.txt using powershell:
     # Select-String -Path build\CMakeCache.txt -Pattern "CMAKE_PROJECT_NAME:STATIC=(.*)" | % { $_.matches.groups[1] } | % {$_.Value}
     # Select-String -Path build\CMakeCache.txt -Pattern "CMAKE_PROJECT_VERSION:STATIC=(.*)" | % { $_.matches.groups[1] } | % {$_.Value}
-    - name: Upload Artifacts (windows)
-      if: matrix.os == 'windows-latest'
-      uses: actions/upload-artifact@master
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v2
       with:
         name: pkg-${{ matrix.os }}
-        path: build/AppTemplate_cpp_qt-1.13.0-Win64.zip
+        path: |
+            build/*.deb
+            build/*.tar.bz2
+            build/*.zip
 
   release:
     needs: build
     runs-on: ubuntu-latest
     steps:
     
-    # TODO: download-artifact@v2 will support multiple download
-    - name: Download Artifact (ubuntu)
+    - name: Download Artifact
       if: startsWith(github.ref, 'refs/tags/')
-      uses: actions/download-artifact@v1
-      with:
-        name: pkg-ubuntu-latest
-
-    - name: Download Artifact (windows)
-      if: startsWith(github.ref, 'refs/tags/')
-      uses: actions/download-artifact@v1
-      with:
-        name: pkg-windows-latest
-
-    - name: Download Artifact (macOS)
-      if: startsWith(github.ref, 'refs/tags/')
-      uses: actions/download-artifact@v1
-      with:
-        name: pkg-macOS-latest
-
+      uses: actions/download-artifact@v2
+    
     - name: Create Release
       if: startsWith(github.ref, 'refs/tags/')
       id: create_release
@@ -137,7 +109,5 @@ jobs:
         draft: false
         prerelease: false
         # body_path: CHANGELOG.txt
-        files: |
-          pkg-ubuntu-latest/AppTemplate_cpp_qt-1.13.0-Linux64-bionic.deb
-          pkg-macOS-latest/AppTemplate_cpp_qt-1.13.0-OSX64.tar.bz2
-          pkg-windows-latest/AppTemplate_cpp_qt-1.13.0-Win64.zip
+        files: 'pkg-*/*'
+