From b58e9c88d940e5107fd0e6af2f7155b3e12d37bb Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 27 Jan 2025 17:41:03 +0100
Subject: [PATCH] DEV: Update the workflow to Ubuntu 24.04

The current LTS
---
 .github/workflows/build.yml    | 4 ++--
 image/base/install-imagemagick | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2dd89da6..c3f1a33ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,8 +28,8 @@ jobs:
 
   base:
     # `debian-12` for amd64 builds
-    # `ubuntu-22.04-8core-arm` for arm64 builds
-    runs-on: ${{ (matrix.arch == 'amd64' && 'debian-12') || 'ubuntu-22.04-8core-arm' }}
+    # `ubuntu-24.04-8core-arm` for arm64 builds
+    runs-on: ${{ (matrix.arch == 'amd64' && 'debian-12') || 'ubuntu-24.04-8core-arm' }}
     strategy:
       matrix:
         arch: [amd64, arm64]
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 4c2df1e0b..92c25e197 100755
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -5,19 +5,15 @@ set -e
 IMAGE_MAGICK_VERSION="7.1.0-62"
 IMAGE_MAGICK_HASH="d282117bc6d0e91ad1ad685d096623b96ed8e229f911c891d83277b350ef884a"
 
-# We use debian, but GitHub CI is stuck on Ubuntu Bionic, so this must be compatible with both
 LIBJPEGTURBO=$(cat /etc/issue | grep -qi Debian && echo 'libjpeg62-turbo libjpeg62-turbo-dev' || echo 'libjpeg-turbo8 libjpeg-turbo8-dev')
 
-# Ubuntu 22.04/22.10  doesn't have libwebp6
-LIBWEBP=$(cat /etc/issue | grep -qiE 'Debian GNU/Linux 12|Ubuntu 22' && echo 'libwebp7' || echo 'libwebp6')
-
 PREFIX=/usr/local
 WDIR=/tmp/imagemagick
 
 # Install build deps
 apt -y -q remove imagemagick
 apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
-    libde265-0 libde265-dev ${LIBJPEGTURBO} ${LIBWEBP} x265 libx265-dev libtool \
+    libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
     libpng16-16 libpng-dev libwebp-dev libgomp1 \
     libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
     libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev