From b5d8abb8848ee4343d2763970915e730c24ad98e Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 30 Dec 2023 12:03:13 +0100 Subject: [PATCH] minimum macos-10.15 for CI Signed-off-by: falkTX --- .github/workflows/build.yml | 10 ++++---- Makefile | 31 ++++-------------------- src/PawPaw | 2 +- utils/debug/jackd | 2 +- utils/debug/mod-ui | 2 +- utils/macos/macos-dmg.sh | 2 +- utils/plugin-builder/validate-plugins.sh | 2 +- 7 files changed, 15 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0b9bf5..098617d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,9 @@ name: build on: [push, pull_request] env: - CACHE_VERSION_LINUX: 10 - CACHE_VERSION_MACOS: 10 - CACHE_VERSION_WIN64: 10 + CACHE_VERSION_LINUX: 11 + CACHE_VERSION_MACOS: 11 + CACHE_VERSION_WIN64: 11 DEBIAN_FRONTEND: noninteractive PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_TESTS: 1 @@ -102,11 +102,11 @@ jobs: matrix: include: - os: macos-11 - target: macos + target: macos-10.15 - os: macos-11 target: macos-universal-10.15 - os: macos-12 - target: macos + target: macos-10.15 - os: macos-12 target: macos-universal-10.15 runs-on: ${{ matrix.os }} diff --git a/Makefile b/Makefile index 0d3a4b6..bb04c40 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ VERSION = $(shell cat VERSION) CC ?= gcc TARGET_MACHINE := $(shell $(CC) -dumpmachine) -ifeq ($(PAWPAW_TARGET),macos) +ifeq ($(PAWPAW_TARGET),macos-10.15) MACOS = true else ifeq ($(PAWPAW_TARGET),macos-universal-10.15) MACOS = true @@ -24,7 +24,7 @@ PAWPAW_TARGET = linux-$(shell uname -m) else ifneq (,$(findstring apple,$(TARGET_MACHINE))) MACOS = true ifeq ($(shell uname -m),x86_64) -PAWPAW_TARGET = macos +PAWPAW_TARGET = macos-10.15 else PAWPAW_TARGET = macos-universal-10.15 endif @@ -112,9 +112,7 @@ TARGETS += build/mod-app.app/Contents/PlugIns/iconengines/libqsvgicon.dylib TARGETS += build/mod-app.app/Contents/PlugIns/imageformats/libqsvg.dylib TARGETS += build/mod-app.app/Contents/PlugIns/LV2 TARGETS += build/mod-app.app/Contents/PlugIns/platforms/libqcocoa.dylib -ifneq ($(PAWPAW_TARGET),macos) TARGETS += build/mod-app.app/Contents/PlugIns/styles/libqmacstyle.dylib -endif TARGETS += build/mod-app.app/Contents/Resources/default.pedalboard TARGETS += build/mod-app.app/Contents/Resources/html TARGETS += build/mod-app.app/Contents/Resources/mod-hardware-descriptor.json @@ -167,6 +165,7 @@ endif # List of plugin projects to build PLUGINS = abgate +PLUGINS += aidadsp-lv2 PLUGINS += artyfx PLUGINS += bolliedelay PLUGINS += caps-lv2 @@ -188,8 +187,8 @@ PLUGINS += mod-pitchshifter PLUGINS += mod-utilities PLUGINS += modmeter PLUGINS += modspectre -# crashing linux https://github.com/moddevices/mod-app/actions/runs/6721112608/job/18266110663 PLUGINS += neuralrecord +PLUGINS += neural-amp-modeler-lv2 PLUGINS += notes-lv2 PLUGINS += pitchtracking-series # crashing linux https://github.com/moddevices/mod-app/actions/runs/6718888228/job/18259448918 @@ -210,14 +209,8 @@ PLUGINS += x42-tinygain PLUGINS += x42-xfade PLUGINS += zam-plugins -# relies on APIs only available in macOS >= 10.15 -ifneq ($(PAWPAW_TARGET),macos) -PLUGINS += aidadsp-lv2 -PLUGINS += neural-amp-modeler-lv2 -endif - # issues with glib static build on non-universal builds (fails to link to -liconv) -ifneq ($(PAWPAW_TARGET),macos) +ifneq ($(PAWPAW_TARGET),macos-10.15) PLUGINS += fluidplug endif @@ -283,20 +276,6 @@ version: # --------------------------------------------------------------------------------------------------------------------- -macos: - $(MAKE) PAWPAW_TARGET=macos-universal-10.15 - -macos-app: - ./utils/run.sh macos-universal-10.15 $(MAKE) -C src/systray - -macos-bootstrap: - ./src/PawPaw/bootstrap-mod.sh macos-universal-10.15 - -macos-plugins: - $(MAKE) PAWPAW_TARGET=macos-universal-10.15 plugins - -# --------------------------------------------------------------------------------------------------------------------- - wasm: $(MAKE) PAWPAW_TARGET=wasm diff --git a/src/PawPaw b/src/PawPaw index 986636b..7e0dad4 160000 --- a/src/PawPaw +++ b/src/PawPaw @@ -1 +1 @@ -Subproject commit 986636b86019c66c04102dff6adac023f213a04d +Subproject commit 7e0dad4b1d1ff0a6e012ab82e3b647885d918b05 diff --git a/utils/debug/jackd b/utils/debug/jackd index cb1cecb..27fab23 100755 --- a/utils/debug/jackd +++ b/utils/debug/jackd @@ -30,7 +30,7 @@ if [ -e jackd.exe ]; then PATH_SEP=';' elif [ -e mod-app.app ]; then if [ "$(uname -m)" = "x86_64" ] && [ x"${1}" != x"macos-universal-10.15" ]; then - source ../src/PawPaw/local.env macos + source ../src/PawPaw/local.env macos-10.15 else source ../src/PawPaw/local.env macos-universal-10.15 fi diff --git a/utils/debug/mod-ui b/utils/debug/mod-ui index 03001bb..edd620d 100755 --- a/utils/debug/mod-ui +++ b/utils/debug/mod-ui @@ -19,7 +19,7 @@ if [ -e mod-ui.exe ]; then PATH_SEP=';' elif [ -e mod-app.app ]; then if [ "$(uname -m)" = "x86_64" ] && [ x"${1}" != x"macos-universal-10.15" ]; then - source ../src/PawPaw/local.env macos + source ../src/PawPaw/local.env macos-10.15 else source ../src/PawPaw/local.env macos-universal-10.15 fi diff --git a/utils/macos/macos-dmg.sh b/utils/macos/macos-dmg.sh index 46034e7..efb4375 100755 --- a/utils/macos/macos-dmg.sh +++ b/utils/macos/macos-dmg.sh @@ -8,7 +8,7 @@ if [ ! -d build ]; then fi if [ "$(uname -m)" = "x86_64" ] && [ x"${1}" != x"macos-universal-10.15" ]; then - PAWPAW_PREFIX="${HOME}/PawPawBuilds/targets/macos" + PAWPAW_PREFIX="${HOME}/PawPawBuilds/targets/macos-10.15" else PAWPAW_PREFIX="${HOME}/PawPawBuilds/targets/macos-universal-10.15" fi diff --git a/utils/plugin-builder/validate-plugins.sh b/utils/plugin-builder/validate-plugins.sh index c11cfbb..9b40658 100755 --- a/utils/plugin-builder/validate-plugins.sh +++ b/utils/plugin-builder/validate-plugins.sh @@ -21,7 +21,7 @@ if [ -e mod-ui.exe ]; then OS_SEP="\\" elif [ -e mod-app.app ]; then if [ "$(uname -m)" = "x86_64" ] && [ x"${1}" != x"macos-universal-10.15" ]; then - source ../src/PawPaw/local.env macos + source ../src/PawPaw/local.env macos-10.15 else source ../src/PawPaw/local.env macos-universal-10.15 fi