Skip to content

Commit 7f785ed

Browse files
CI: Don't build on Ubuntu 20.04 anymore
1 parent 8830720 commit 7f785ed

File tree

3 files changed

+14
-32
lines changed

3 files changed

+14
-32
lines changed

.github/actions/install-dependencies/install-dependencies.sh

+10-17
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,35 @@ fi
1919

2020
ubuntu_packages='gettext libadplug-dev libasound2-dev libavformat-dev
2121
libbinio-dev libbs2b-dev libcddb2-dev libcdio-cdda-dev
22-
libcue-dev libcurl4-gnutls-dev
23-
libfaad-dev libflac-dev libfluidsynth-dev libgl1-mesa-dev
24-
libjack-jackd2-dev libjson-glib-dev libmms-dev libmodplug-dev
25-
libmp3lame-dev libmpg123-dev libneon27-gnutls-dev libnotify-dev
26-
libopenmpt-dev libopusfile-dev libpulse-dev libqt5opengl5-dev
22+
libcue-dev libcurl4-gnutls-dev libfaad-dev libflac-dev
23+
libfluidsynth-dev libgl1-mesa-dev libjack-jackd2-dev
24+
libjson-glib-dev libmms-dev libmodplug-dev libmp3lame-dev
25+
libmpg123-dev libneon27-gnutls-dev libnotify-dev libopenmpt-dev
26+
libopusfile-dev libpipewire-0.3-dev libpulse-dev
2727
libsamplerate0-dev libsdl2-dev libsidplayfp-dev libsndfile1-dev
2828
libsndio-dev libsoxr-dev libvorbis-dev libwavpack-dev libxml2-dev'
2929

30-
ubuntu_qt5_packages='libqt5svg5-dev libqt5x11extras5-dev qtbase5-dev qtmultimedia5-dev'
30+
ubuntu_qt5_packages='libqt5opengl5-dev libqt5svg5-dev libqt5x11extras5-dev
31+
qtbase5-dev qtmultimedia5-dev'
3132
ubuntu_qt6_packages='qt6-base-dev qt6-multimedia-dev qt6-svg-dev'
3233

3334
macos_packages='adplug faad2 ffmpeg libbs2b libcue libmms libmodplug libnotify
3435
libopenmpt libsamplerate libsoxr neon opusfile sdl2 wavpack'
3536

3637
case "$os" in
37-
ubuntu-20.04)
38+
ubuntu-22.04)
3839
if [ "$build_system" = 'meson' ]; then
3940
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev meson
4041
else
4142
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev
4243
fi
4344
;;
4445

45-
ubuntu-22.04)
46-
if [ "$build_system" = 'meson' ]; then
47-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk-3-dev liblircclient-dev libpipewire-0.3-dev meson
48-
else
49-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk-3-dev liblircclient-dev libpipewire-0.3-dev
50-
fi
51-
;;
52-
5346
ubuntu*)
5447
if [ "$build_system" = 'meson' ]; then
55-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev libpipewire-0.3-dev meson
48+
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev meson
5649
else
57-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev libpipewire-0.3-dev
50+
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev
5851
fi
5952
;;
6053

.github/actions/run-action/run-action.sh

+3-12
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# --- Build configuration ---
44
#
5-
# ubuntu-20.04: Qt 5 + GTK 2
6-
# ubuntu-22.04: Qt 5 + GTK 3
5+
# ubuntu-22.04: Qt 5 + GTK 2
76
# ubuntu-24.04: Qt 6 + GTK 3
87
# Windows: Qt 6 + GTK 2
98
# macOS 13: Qt 5 - GTK
@@ -25,22 +24,14 @@ fi
2524
case "$action" in
2625
configure)
2726
case "$os" in
28-
ubuntu-20.04)
27+
ubuntu-22.04)
2928
if [ "$build_system" = 'meson' ]; then
3029
meson setup build -D qt5=true -D gtk2=true
3130
else
3231
./autogen.sh && ./configure --enable-qt5 --enable-gtk2
3332
fi
3433
;;
3534

36-
ubuntu-22.04)
37-
if [ "$build_system" = 'meson' ]; then
38-
meson setup build -D qt5=true
39-
else
40-
./autogen.sh && ./configure --enable-qt5
41-
fi
42-
;;
43-
4435
ubuntu*)
4536
if [ "$build_system" = 'meson' ]; then
4637
meson setup build
@@ -88,7 +79,7 @@ case "$action" in
8879

8980
build)
9081
if [ "$build_system" = 'meson' ]; then
91-
ninja -C build
82+
meson compile -C build
9283
elif [[ "$os" == macos* ]]; then
9384
make -j$(sysctl -n hw.logicalcpu)
9485
else

.github/workflows/c-cpp.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
14-
macos-13, macos-15,
15-
windows-2022]
13+
os: [ubuntu-22.04, ubuntu-24.04]
1614
build-system: [autotools, meson]
1715
exclude:
1816
- os: macos-15

0 commit comments

Comments
 (0)