Martchus/pianobooster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Captnfab/fix ci
This commit is contained in:
Capitaine Fab 2023-01-16 19:51:01 +01:00 committed by GitHub
commit a127861b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored
View File

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

8
src/MidiDeviceFluidSynth.cpp
View File

@ -30,7 +30,13 @@
static fluid_settings_t* s_debug_fluid_settings; 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]; char buffer[300];
fluid_settings_copystr(s_debug_fluid_settings, name, buffer, sizeof (buffer)); fluid_settings_copystr(s_debug_fluid_settings, name, buffer, sizeof (buffer));