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 · 86621a4 · 86621a4
1 parent 2a9a6ce
commit 86621a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh
@@ -2,8 +2,7 @@
 
 # --- Dependency 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
@@ -18,22 +17,14 @@ if [ -z "$os" ] || [ -z "$build_system" ]; then
 fi
 
 case "$os" in
-  ubuntu-20.04)
+  ubuntu-22.04)
     if [ "$build_system" = 'meson' ]; then
       sudo apt-get -qq update && sudo apt-get install libgtk2.0-dev qtbase5-dev libqt5svg5-dev meson
     else
       sudo apt-get -qq update && sudo apt-get install libgtk2.0-dev qtbase5-dev libqt5svg5-dev
     fi
     ;;
 
-  ubuntu-22.04)
-    if [ "$build_system" = 'meson' ]; then
-      sudo apt-get -qq update && sudo apt-get install libgtk-3-dev qtbase5-dev libqt5svg5-dev gettext meson
-    else
-      sudo apt-get -qq update && sudo apt-get install libgtk-3-dev qtbase5-dev libqt5svg5-dev gettext
-    fi
-    ;;
-
   ubuntu*)
     if [ "$build_system" = 'meson' ]; then
       sudo apt-get -qq update && sudo apt-get install libgtk-3-dev qt6-base-dev qt6-svg-dev gettext meson

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
@@ -29,22 +28,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
@@ -94,7 +85,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]