Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build and CI fixes #2628

Merged
merged 3 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ jobs:
git checkout bd1620a8609ddaf2f64500820abc8b4d150edeaf # v1.1.0
./install-user-client

- name: Cache Clang Tidy
uses: actions/cache@v3.3.2
- name: Restore Clang Tidy cache
uses: actions/cache/restore@v3.3.2
with:
# since the ctcache is just a list of checksums that were checked, we want to write to it every ci run to keep it up to date
# otherwise github actions just restores some old cache if the key didn't change
Expand All @@ -242,6 +242,15 @@ jobs:
cd build
PATH=~/.local/bin:"$PATH" CTCACHE_DIR=/tmp/ci-ctcache ../util/clang-tidy.sh

- name: Save Clang Tidy cache
uses: actions/cache/save@v3.3.2
# always run, except if the workflow was cancelled
# this means clang tidy will get cached even if some checks are failing
if: success() || failure()
with:
path: /tmp/ci-ctcache
key: clang-tidy-ctcache-${{ github.run_id }}

appstream-news-validate:
name: AppStream and News validate
runs-on: ubuntu-22.04
Expand Down
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ endif
if get_option('enable-mold')
# mold 1.11.0 or later needed due to https://github.com/rui314/mold/issues/1017
status += 'Using mold linker, so make sure mold 1.11.0 or later is installed on your system.'
link_args = ['-fuse-ld=mold']
# --no-as-needed temporarily necessary due to the seeming return of https://github.com/rui314/mold/issues/1017
link_args = ['-fuse-ld=mold', '-Wl,--no-as-needed']
else
link_args = []
endif
Expand Down
9 changes: 9 additions & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@ easyeffects_sources = [
gresources
]

cc = meson.get_compiler('c')

# apparantly this is not available as a standard dependency
have_ladspa = cc.has_header('ladspa.h')

if not have_ladspa
error('Dependency "ladspa" not found, tried looking for ladspa.h')
endif

cxx = meson.get_compiler('cpp')

zita_convolver = cxx.find_library('zita-convolver', required: true)
Expand Down
Loading