Skip to content

Commit

Permalink
CI: Build also on Ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
radioactiveman committed May 25, 2024
1 parent 3e530e5 commit 5732472
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 10 deletions.
27 changes: 19 additions & 8 deletions .github/actions/install-dependencies/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# ubuntu-20.04: Qt 5 + GTK 2
# ubuntu-22.04: Qt 5 + GTK 3
# ubuntu-24.04: Qt 6 + GTK 3
# Windows: Qt 6 + GTK 2
# macOS (Autotools): Qt 5 - GTK
# macOS (Meson): Qt 6 - GTK
Expand All @@ -24,28 +25,38 @@ ubuntu_packages='gettext libadplug-dev libasound2-dev libavformat-dev
libmms-dev libmodplug-dev libmp3lame-dev libmpg123-dev
libneon27-gnutls-dev libnotify-dev libopenmpt-dev
libopusfile-dev libpulse-dev libqt5opengl5-dev
libqt5x11extras5-dev libsamplerate0-dev libsdl2-dev
libsidplayfp-dev libsndfile1-dev libsndio-dev libsoxr-dev
libvorbis-dev libwavpack-dev libxml2-dev qtbase5-dev
qtmultimedia5-dev'
libsamplerate0-dev libsdl2-dev libsidplayfp-dev
libsndfile1-dev libsndio-dev libsoxr-dev libvorbis-dev
libwavpack-dev libxml2-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'

case "$os" in
ubuntu-20.04)
if [ "$build_system" = 'meson' ]; then
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages libgtk2.0-dev meson
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev meson
else
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev
fi
;;

ubuntu-22.04)
if [ "$build_system" = 'meson' ]; then
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk-3-dev libpipewire-0.3-dev meson
else
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages libgtk2.0-dev
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk-3-dev libpipewire-0.3-dev
fi
;;

ubuntu*)
if [ "$build_system" = 'meson' ]; then
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages libgtk-3-dev libpipewire-0.3-dev meson
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev libpipewire-0.3-dev meson
else
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages libgtk-3-dev libpipewire-0.3-dev
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev libpipewire-0.3-dev
fi
;;

Expand Down
11 changes: 10 additions & 1 deletion .github/actions/run-action/run-action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# ubuntu-20.04: Qt 5 + GTK 2
# ubuntu-22.04: Qt 5 + GTK 3
# ubuntu-24.04: Qt 6 + GTK 3
# Windows: Qt 6 + GTK 2
# macOS (Autotools): Qt 5 - GTK
# macOS (Meson): Qt 6 - GTK
Expand Down Expand Up @@ -32,14 +33,22 @@ case "$action" in
fi
;;

ubuntu*)
ubuntu-22.04)
if [ "$build_system" = 'meson' ]; then
meson setup build -D qt5=true
else
./autogen.sh && ./configure --enable-qt5
fi
;;

ubuntu*)
if [ "$build_system" = 'meson' ]; then
meson setup build
else
./autogen.sh && ./configure
fi
;;

macos*)
if [ "$build_system" = 'meson' ]; then
meson setup build -D gtk=false -D mac-media-keys=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
strategy:
matrix:
os: ['ubuntu-20.04', 'ubuntu-22.04', 'macos-12', 'windows-2022']
os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04'] # , 'macos-12', 'windows-2022']
build-system: ['autotools', 'meson']
fail-fast: false
runs-on: ${{ matrix.os }}
Expand Down

0 comments on commit 5732472

Please sign in to comment.