From 95ed3b7656f11b43b96b183a0d928f847d3923c0 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sat, 25 May 2024 18:35:08 +0200 Subject: [PATCH] CI: Test if macOS 14 build succeeds --- .github/actions/install-dependencies/install-dependencies.sh | 5 +++-- .github/actions/run-action/run-action.sh | 4 ++-- .github/workflows/c-cpp.yml | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh index 04ec0909b..4b5b319bc 100755 --- a/.github/actions/install-dependencies/install-dependencies.sh +++ b/.github/actions/install-dependencies/install-dependencies.sh @@ -30,8 +30,9 @@ ubuntu_packages='gettext libadplug-dev libasound2-dev libavformat-dev ubuntu_qt5_packages='libqt5x11extras5-dev qtbase5-dev qtmultimedia5-dev' ubuntu_qt6_packages='qt6-base-dev' -macos_packages='adplug faad2 ffmpeg libbs2b libcue libmms libmodplug libnotify - libopenmpt libsamplerate libsoxr neon sdl2 wavpack' +macos_packages='adplug faad2 ffmpeg lame libbs2b libcue libmms libmodplug + libnotify libopenmpt libsamplerate libsoxr neon opusfile + sdl2 wavpack' case "$os" in ubuntu-20.04) diff --git a/.github/actions/run-action/run-action.sh b/.github/actions/run-action/run-action.sh index 96a7d3763..0f97c5039 100755 --- a/.github/actions/run-action/run-action.sh +++ b/.github/actions/run-action/run-action.sh @@ -53,8 +53,8 @@ case "$action" in if [ "$build_system" = 'meson' ]; then meson setup build -D gtk=false -D mac-media-keys=true else - export PATH="/usr/local/opt/qt@5/bin:$PATH" - export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" + export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" + export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" ./autogen.sh && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys fi ;; diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b31c79f35..7d6c7ff8e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -10,7 +10,8 @@ jobs: build: strategy: matrix: - os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'macos-12', 'windows-2022'] + #os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'macos-12', 'windows-2022'] + os: ['macos-14'] build-system: ['autotools', 'meson'] fail-fast: false runs-on: ${{ matrix.os }} @@ -22,7 +23,7 @@ jobs: - name: Checkout audacious uses: actions/checkout@v4 with: - repository: audacious-media-player/audacious + repository: radioactiveman/audacious path: audacious - name: Install dependencies