Skip to content

Commit 67c642e

Browse files
authored
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
1 parent f0bb3e3 commit 67c642e

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
build: { cc: clang-14, cxx: clang++-14, linker: ld.lld-14, sanitize: true }
2121
shell: bash
2222

23-
- name: "macOS (11.6) - Xcode 13.2.1"
24-
os: macos-11
23+
- name: "macOS (12.6) - Xcode 14.0.1"
24+
os: macos-12
2525
build: { cc: clang, cxx: clang++, linker: ld.lld }
2626
shell: bash
2727

@@ -40,21 +40,19 @@ jobs:
4040
CXX: ${{ matrix.build.cxx }}
4141
LD: ${{ matrix.build.linker }}
4242
CPPFLAGS: -Wall
43-
DEBIAN_FRONTEND: noninteractive
44-
HOMEBREW_NO_AUTO_UPDATE: 1
4543

4644
steps:
4745
- name: Checkout code
48-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
4947

5048
- name: Update apt
5149
if: runner.os == 'Linux'
52-
run: sudo -E apt-get update -qq -o Acquire::Retries=3
50+
run: sudo apt-get update -qq
5351

5452
- name: Install Ubuntu dependencies
5553
if: runner.os == 'Linux'
5654
run:
57-
sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3
55+
sudo apt-get install -fqq
5856
meson
5957
python3-pip python3-setuptools python3-wheel
6058
libfftw3-dev libexif-dev libjpeg-turbo8-dev
@@ -70,12 +68,12 @@ jobs:
7068
if: runner.os == 'macOS'
7169
run: |
7270
brew install meson ninja fftw fontconfig glib libexif libgsf little-cms2 orc pango
73-
brew install cfitsio libheif libimagequant libjpeg-turbo libmatio librsvg libspng libtiff openexr openjpeg openslide poppler webp cgif
71+
brew install cfitsio cgif jpeg-xl libheif libimagequant libjpeg-turbo libmatio librsvg libspng libtiff openexr openjpeg openslide poppler webp
7472
7573
- name: Install Clang 14
7674
if: runner.os == 'Linux' && matrix.build.cc == 'clang-14'
7775
run:
78-
sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3
76+
sudo apt-get install -fqq
7977
clang-14 libomp-14-dev lld-14 llvm-14
8078

8179
- name: Prepare macOS environment

test/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# libvips test suite
22

33
This is in two parts: a few simple bash scripts in this directory are run on
4-
"make check", and a fancier Python test suite that's run by Travis on each
5-
commit.
4+
"meson test", and a fancier Python test suite that's run by GitHub actions on
5+
each commit.

0 commit comments

Comments
 (0)