sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CI: various improvements (#3096)

Browse Source 
* 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:
6c93c24107/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:
6c93c24107/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:
6c93c24107/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
This commit is contained in:
Kleis Auke Wolthuizen 2022-10-17 20:08:35 +02:00 committed by GitHub
parent f0bb3e3442
commit 67c642e5ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci.yml vendored
View File

@ -20,8 +20,8 @@ jobs:
build: { cc: clang-14, cxx: clang++-14, linker: ld.lld-14, sanitize: true } build: { cc: clang-14, cxx: clang++-14, linker: ld.lld-14, sanitize: true }
shell: bash shell: bash
- name: "macOS (11.6) - Xcode 13.2.1" - name: "macOS (12.6) - Xcode 14.0.1"
os: macos-11 os: macos-12
build: { cc: clang, cxx: clang++, linker: ld.lld } build: { cc: clang, cxx: clang++, linker: ld.lld }
shell: bash shell: bash
@ -40,21 +40,19 @@ jobs:
CXX: ${{ matrix.build.cxx }} CXX: ${{ matrix.build.cxx }}
LD: ${{ matrix.build.linker }} LD: ${{ matrix.build.linker }}
CPPFLAGS: -Wall CPPFLAGS: -Wall
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Update apt - name: Update apt
if: runner.os == 'Linux' 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 - name: Install Ubuntu dependencies
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: run:
sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3 sudo apt-get install -fqq
meson meson
python3-pip python3-setuptools python3-wheel python3-pip python3-setuptools python3-wheel
libfftw3-dev libexif-dev libjpeg-turbo8-dev libfftw3-dev libexif-dev libjpeg-turbo8-dev
@ -70,12 +68,12 @@ jobs:
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
brew install meson ninja fftw fontconfig glib libexif libgsf little-cms2 orc pango 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 - name: Install Clang 14
if: runner.os == 'Linux' && matrix.build.cc == 'clang-14' if: runner.os == 'Linux' && matrix.build.cc == 'clang-14'
run: 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 clang-14 libomp-14-dev lld-14 llvm-14
- name: Prepare macOS environment - name: Prepare macOS environment

4
test/README.md
View File

@ -1,5 +1,5 @@
# libvips test suite # libvips test suite
This is in two parts: a few simple bash scripts in this directory are run on 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 "meson test", and a fancier Python test suite that's run by GitHub actions on
commit. each commit.