Skip to content

Commit 79ccbcc

Browse files
authored
DEV: Update the workflow to Ubuntu 24.04 (#928)
The current LTS
1 parent 90a1b46 commit 79ccbcc

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
2929
base:
3030
# `debian-12` for amd64 builds
31-
# `ubuntu-22.04-8core-arm` for arm64 builds
32-
runs-on: ${{ (matrix.arch == 'amd64' && 'debian-12') || 'ubuntu-22.04-8core-arm' }}
31+
# `ubuntu-24.04-8core-arm` for arm64 builds
32+
runs-on: ${{ (matrix.arch == 'amd64' && 'debian-12') || 'ubuntu-24.04-8core-arm' }}
3333
strategy:
3434
matrix:
3535
arch: [amd64, arm64]

image/base/install-imagemagick

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,15 @@ set -e
55
IMAGE_MAGICK_VERSION="7.1.0-62"
66
IMAGE_MAGICK_HASH="d282117bc6d0e91ad1ad685d096623b96ed8e229f911c891d83277b350ef884a"
77

8-
# We use debian, but GitHub CI is stuck on Ubuntu Bionic, so this must be compatible with both
98
LIBJPEGTURBO=$(cat /etc/issue | grep -qi Debian && echo 'libjpeg62-turbo libjpeg62-turbo-dev' || echo 'libjpeg-turbo8 libjpeg-turbo8-dev')
109

11-
# Ubuntu 22.04/22.10 doesn't have libwebp6
12-
LIBWEBP=$(cat /etc/issue | grep -qiE 'Debian GNU/Linux 12|Ubuntu 22' && echo 'libwebp7' || echo 'libwebp6')
13-
1410
PREFIX=/usr/local
1511
WDIR=/tmp/imagemagick
1612

1713
# Install build deps
1814
apt -y -q remove imagemagick
1915
apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
20-
libde265-0 libde265-dev ${LIBJPEGTURBO} ${LIBWEBP} x265 libx265-dev libtool \
16+
libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
2117
libpng16-16 libpng-dev libwebp-dev libgomp1 \
2218
libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
2319
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev

0 commit comments

Comments
 (0)