brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update carla and dpf, fixup CI

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2024-11-10 10:50:40 +01:00
parent 0b01d0844a
commit 3b03363374
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View file

@ -3,7 +3,7 @@ name: build
on: [push, pull_request] on: [push, pull_request]
env: env:
CACHE_VERSION: 10 CACHE_VERSION: 11
CARDINAL_UNDER_WINE: 1 CARDINAL_UNDER_WINE: 1
CIBUILD: true CIBUILD: true
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
@ -143,7 +143,7 @@ jobs:
# multiple jobs for building carla, deps and plugins # multiple jobs for building carla, deps and plugins
make DEBUG=true carla deps dgl plugins resources -j $(nproc) make DEBUG=true carla deps dgl plugins resources -j $(nproc)
# single job for final build stage, otherwise we might get killed due to OOM # single job for final build stage, otherwise we might get killed due to OOM
make DEBUG=true HAVE_PULSEAUDIO=false clap lv2 vst2 vst3 -j 1 make DEBUG=true HAVE_PULSEAUDIO=false jack -j 1
- name: Set sha8 - name: Set sha8
id: slug id: slug
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@ -171,6 +171,7 @@ jobs:
run: | run: |
if [ "${{ matrix.debug }}" -eq 1 ]; then if [ "${{ matrix.debug }}" -eq 1 ]; then
echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV
echo "MAKE_ARGS='DEBUG=true jack au'" >> $GITHUB_ENV
echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV
fi fi
- name: Set up cache - name: Set up cache
@ -207,7 +208,7 @@ jobs:
export PATH="/usr/local/opt/ccache/libexec:${PATH}" export PATH="/usr/local/opt/ccache/libexec:${PATH}"
source deps/PawPaw/local.env macos-${{ matrix.target }} source deps/PawPaw/local.env macos-${{ matrix.target }}
make features make features
make NOOPT=true -j $(sysctl -n hw.logicalcpu) make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
- name: Build macOS (packaging) - name: Build macOS (packaging)
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
shell: bash shell: bash

2
carla

@ -1 +1 @@
Subproject commit e39f04d2d8587327e741ad881617c427f5014d48 Subproject commit be2f1056ab48c0ec6a3877a19597cb36a44f1e30

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit e0a81ba6f24b194c7aa0c6828d422f1354256a09 Subproject commit 42210d5b21d7c1022b014b84589bca04abe3a245

2
dpf

@ -1 +1 @@
Subproject commit 6b042628933f220a05571bde6a02fe0198a96b5d Subproject commit c776dab9ebae0f067be2a52012fa205de7ae7b7d

2
src/Makefile.cardinal.mk
View file

@ -186,7 +186,7 @@ endif
endif endif
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit -framework AudioToolbox
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion
endif endif