Merge 18e8436 into 7674d0d

jacktrip · Jan 10, 2022 · 3aa1175 · 3aa1175
2 parents 7674d0d + 18e8436
commit 3aa1175
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/.github/workflows/jacktrip.yml b/.github/workflows/jacktrip.yml
@@ -49,14 +49,12 @@ jobs:
             # meson-library-type: shared # shared, static, both
             # static-analysis: true # run clang-tidy static analysis (meson/Linux only)
 
-          - name: Linux-x64-qmake-gcc-static-bundled_rtaudio
+          - name: Linux-x64-qmake-gcc-shared-bundled_rtaudio
             runs-on: ubuntu-18.04
             system-rtaudio: false
             bundled-rtaudio: true
             nogui: false
             weakjack: false
-            static-qt-version: 5.12.11
-            qt-static-cache-key: 'v22'
             # jacktrip-path: jacktrip
             # binary-path: binary
             build-system: qmake
@@ -109,14 +107,12 @@ jobs:
             installer-path: installer
             build-system: qmake
 
-          - name: macOS-x64-qmake-clang-static-bundled_rtaudio
+          - name: macOS-x64-qmake-clang-shared-bundled_rtaudio
             runs-on: macos-10.15
             system-rtaudio: false
             bundled-rtaudio: true
             nogui: false
             weakjack: true
-            static-qt-version: 5.12.11
-            qt-static-cache-key: 'v05'
             # jacktrip-path: jacktrip
             # binary-path: binary
             # bundle-path: bundle
@@ -136,32 +132,19 @@ jobs:
             build-system: meson
             meson-library-type: both
 
-          - name: Windows-x64-qmake-gcc-static
+          - name: Windows-x64-qmake-gcc-static-bundled_rtaudio
             release-name: Windows-x64
             runs-on: windows-2019
-            system-rtaudio: true
-            bundled-rtaudio: false
+            system-rtaudio: false
+            bundled-rtaudio: true
             nogui: false
             weakjack: true
-            vcpkg-triplet: x64-mingw-static
             static-qt-version: 5.15.2
             qt-static-cache-key: 'v04'
             jacktrip-path: release/jacktrip.exe
             binary-path: binary
             installer-path: installer
             build-system: qmake
-
-          - name: Windows-x64-qmake-gcc-static-bundled_rtaudio
-            runs-on: windows-2019
-            system-rtaudio: false
-            bundled-rtaudio: true
-            nogui: false
-            weakjack: true
-            static-qt-version: 5.15.2
-            qt-static-cache-key: 'v04'
-            # jacktrip-path: release/jacktrip.exe
-            # binary-path: binary
-            build-system: qmake
 
           - name: Windows-x64-qmake-gcc-shared
             runs-on: windows-2019