Merge pull request #319 from pianobooster/captnfab/fix-ci

Captnfab/fix ci

.github/workflows/build.yml

@@ -1,6 +1,11 @@
 name: Build
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - "develop"
+      - "master"
 
 jobs:
   linux-build:
@@ -54,15 +59,13 @@ jobs:
              checksum.txt
 
   macos-build:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2.0.0
       - name: Install dependencies
         run: |
-          brew update || brew update
-          brew upgrade
-          brew install cmake qt5 ftgl pkg-config fluid-synth
+          brew install cmake qt@5 ftgl pkg-config fluid-synth
       - name: Define variables
         run: |
           pb_ver=`grep PB_VERSION src/version.h | cut -d "\"" -f 2`
@@ -76,10 +79,11 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt)"
+          export PKG_CONFIG_PATH="$(brew --prefix readline)/lib/pkgconfig:$PKG_CONFIG_PATH"
+          cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);"
           make
           make install-translations
-          $(brew --prefix qt)/bin/macdeployqt build/pianobooster.app -dmg
+          $(brew --prefix qt@5)/bin/macdeployqt build/pianobooster.app -dmg
           find .
           echo "Done!"
           mv build/*dmg ../${pb_app_name}.dmg

src/MidiDeviceFluidSynth.cpp

@@ -30,7 +30,13 @@
 
 static fluid_settings_t* s_debug_fluid_settings;
 
-static void debug_settings_foreach_func (void *data, const char *name, int type)
+static void debug_settings_foreach_func (void *data,
+#if FLUIDSYNTH_VERSION_MAJOR >= 2
+    const char *name,
+#else
+    char *name,
+#endif
+    int type)
 {
     char buffer[300];
     fluid_settings_copystr(s_debug_fluid_settings, name, buffer, sizeof (buffer));