From 67c642e5ec2e29999c811945977e72357cbf3c84 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Mon, 17 Oct 2022 20:08:35 +0200
Subject: [PATCH] CI: various improvements (#3096)

* CI: upgrade macOS runner to version 12 (Monterey)

* CI: upgrade actions/checkout to v3

* CI: remove retry logic for apt

The Linux runners on GitHub Actions already retries up to 10 times,
see:
https://github.com/actions/runner-images/blob/6c93c2410761a9338b9ebf3ff1cc19c971901a97/images/linux/scripts/base/apt.sh#L11-L12

* CI: remove redundant `DEBIAN_FRONTEND=noninteractive` env

The Linux runners on GitHub Actions already sets this env variable,
see:
https://github.com/actions/runner-images/blob/6c93c2410761a9338b9ebf3ff1cc19c971901a97/images/linux/scripts/installers/dpkg-config.sh#L10

* CI: remove redundant `HOMEBREW_NO_AUTO_UPDATE=1` env

The macOS runners on GitHub Actions already sets this env variable,
see:
https://github.com/actions/runner-images/blob/6c93c2410761a9338b9ebf3ff1cc19c971901a97/images/macos/provision/configuration/environment/bashrc#L26

* CI: prefer shorthand flag of apt-get `--fix-missing`

* CI: install libjxl on macOS runner

* Update test suite's README.md
---
 .github/workflows/ci.yml | 16 +++++++---------
 test/README.md           |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3989467..e393df0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
             build: { cc: clang-14, cxx: clang++-14, linker: ld.lld-14, sanitize: true }
             shell: bash
 
-          - name: "macOS (11.6) - Xcode 13.2.1"
-            os: macos-11
+          - name: "macOS (12.6) - Xcode 14.0.1"
+            os: macos-12
             build: { cc: clang, cxx: clang++, linker: ld.lld }
             shell: bash
 
@@ -40,21 +40,19 @@ jobs:
       CXX: ${{ matrix.build.cxx }}
       LD: ${{ matrix.build.linker }}
       CPPFLAGS: -Wall
-      DEBIAN_FRONTEND: noninteractive
-      HOMEBREW_NO_AUTO_UPDATE: 1
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Update apt
         if: runner.os == 'Linux'
-        run: sudo -E apt-get update -qq -o Acquire::Retries=3
+        run: sudo apt-get update -qq
 
       - name: Install Ubuntu dependencies
         if: runner.os == 'Linux'
         run:
-          sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3
+          sudo apt-get install -fqq
             meson
             python3-pip python3-setuptools python3-wheel
             libfftw3-dev libexif-dev libjpeg-turbo8-dev
@@ -70,12 +68,12 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install meson ninja fftw fontconfig glib libexif libgsf little-cms2 orc pango
-          brew install cfitsio libheif libimagequant libjpeg-turbo libmatio librsvg libspng libtiff openexr openjpeg openslide poppler webp cgif
+          brew install cfitsio cgif jpeg-xl libheif libimagequant libjpeg-turbo libmatio librsvg libspng libtiff openexr openjpeg openslide poppler webp
 
       - name: Install Clang 14
         if: runner.os == 'Linux' && matrix.build.cc == 'clang-14'
         run:
-          sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3
+          sudo apt-get install -fqq
             clang-14 libomp-14-dev lld-14 llvm-14
 
       - name: Prepare macOS environment
diff --git a/test/README.md b/test/README.md
index c84c9935..6a59882c 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,5 +1,5 @@
 # libvips test suite
 
 This is in two parts: a few simple bash scripts in this directory are run on
-"make check", and a fancier Python test suite that's run by Travis on each
-commit.
+"meson test", and a fancier Python test suite that's run by GitHub actions on
+each commit.