CI: Don't build on Ubuntu 20.04 anymore

GitHub has deprecated the runner image and will remove it in April. See also: actions/runner-images#11101
audacious-media-player · Feb 22, 2025 · ab46802 · ab46802
1 parent b1a9fbd
commit ab46802
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 30 deletions.
diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh
@@ -19,42 +19,35 @@ fi
 
 ubuntu_packages='gettext libadplug-dev libasound2-dev libavformat-dev
                  libbinio-dev libbs2b-dev libcddb2-dev libcdio-cdda-dev
-                 libcue-dev libcurl4-gnutls-dev
-                 libfaad-dev libflac-dev libfluidsynth-dev libgl1-mesa-dev
-                 libjack-jackd2-dev libjson-glib-dev libmms-dev libmodplug-dev
-                 libmp3lame-dev libmpg123-dev libneon27-gnutls-dev libnotify-dev
-                 libopenmpt-dev libopusfile-dev libpulse-dev libqt5opengl5-dev
+                 libcue-dev libcurl4-gnutls-dev libfaad-dev libflac-dev
+                 libfluidsynth-dev libgl1-mesa-dev libjack-jackd2-dev
+                 libjson-glib-dev libmms-dev libmodplug-dev libmp3lame-dev
+                 libmpg123-dev libneon27-gnutls-dev libnotify-dev libopenmpt-dev
+                 libopusfile-dev libpipewire-0.3-dev libpulse-dev
                  libsamplerate0-dev libsdl2-dev libsidplayfp-dev libsndfile1-dev
                  libsndio-dev libsoxr-dev libvorbis-dev libwavpack-dev libxml2-dev'
 
-ubuntu_qt5_packages='libqt5svg5-dev libqt5x11extras5-dev qtbase5-dev qtmultimedia5-dev'
+ubuntu_qt5_packages='libqt5opengl5-dev libqt5svg5-dev libqt5x11extras5-dev
+                     qtbase5-dev qtmultimedia5-dev'
 ubuntu_qt6_packages='qt6-base-dev qt6-multimedia-dev qt6-svg-dev'
 
 macos_packages='adplug faad2 ffmpeg libbs2b libcue libmms libmodplug libnotify
                 libopenmpt libsamplerate libsoxr neon opusfile sdl2 wavpack'
 
 case "$os" in
-  ubuntu-20.04)
+  ubuntu-22.04)
     if [ "$build_system" = 'meson' ]; then
       sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev meson
     else
       sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-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 liblircclient-dev libpipewire-0.3-dev meson
-    else
-      sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk-3-dev liblircclient-dev libpipewire-0.3-dev
-    fi
-    ;;
-
   ubuntu*)
     if [ "$build_system" = 'meson' ]; then
-      sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev libpipewire-0.3-dev meson
+      sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev meson
     else
-      sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev libpipewire-0.3-dev
+      sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev
     fi
     ;;
 

diff --git a/.github/actions/run-action/run-action.sh b/.github/actions/run-action/run-action.sh
@@ -2,8 +2,7 @@
 
 # --- Build configuration ---
 #
-# ubuntu-20.04:      Qt 5 + GTK 2
-# ubuntu-22.04:      Qt 5 + GTK 3
+# ubuntu-22.04:      Qt 5 + GTK 2
 # ubuntu-24.04:      Qt 6 + GTK 3
 # Windows:           Qt 6 + GTK 2
 # macOS 13:          Qt 5 - GTK
@@ -25,22 +24,14 @@ fi
 case "$action" in
   configure)
     case "$os" in
-      ubuntu-20.04)
+      ubuntu-22.04)
         if [ "$build_system" = 'meson' ]; then
           meson setup build -D qt5=true -D gtk2=true
         else
           ./autogen.sh && ./configure --enable-qt5 --enable-gtk2
         fi
         ;;
 
-      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
@@ -88,7 +79,7 @@ case "$action" in
 
   build)
     if [ "$build_system" = 'meson' ]; then
-      ninja -C build
+      meson compile -C build
     elif [[ "$os" == macos* ]]; then
       make -j$(sysctl -n hw.logicalcpu)
     else

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04,
+        os: [ubuntu-22.04, ubuntu-24.04,
              macos-13, macos-15,
              windows-2022]
         build-system: [autotools, meson]