DEV: Update the workflow to Ubuntu 24.04 ()

The current LTS
This commit is contained in:
Jarek Radosz 2025-01-28 01:58:35 +01:00 committed by GitHub
parent 90a1b46e98
commit 79ccbcc532
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
.github/workflows
image/base

View file

@ -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]

View file

@ -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