From d5401f745fecd0f43b0ccb9dd5d597ebb9d7404a Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Wed, 25 Sep 2024 15:39:21 +0200 Subject: [PATCH] Fix missing libavif-dev in asan nightly Asan still runs on Ubuntu 20.04, which doesn't contain the libavif-dev package. --- .github/actions/apt-x64/action.yml | 6 +++++- .github/actions/configure-x64/action.yml | 2 +- .github/workflows/nightly.yml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml index e4d8ff6994a39..b3f03ffdb692b 100644 --- a/.github/actions/apt-x64/action.yml +++ b/.github/actions/apt-x64/action.yml @@ -1,4 +1,8 @@ name: apt +inputs: + asan: + default: false + required: false runs: using: composite steps: @@ -39,7 +43,7 @@ runs: libsqlite3-dev \ libsqlite3-mod-spatialite \ libwebp-dev \ - libavif-dev \ + ${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \ libonig-dev \ libcurl4-openssl-dev \ libxml2-dev \ diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index ef0374cdd53dd..dacca09820651 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -28,7 +28,7 @@ runs: --enable-gd \ --with-jpeg \ --with-webp \ - --with-avif \ + ${{ inputs.skipSlow == 'false' && '--with-avif' || '' }} \ --with-freetype \ --with-xpm \ --enable-exif \ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0d3a2de34c3f3..f0a31f9151e90 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -162,6 +162,7 @@ jobs: ${{ matrix.configuration_parameters }} --${{ matrix.debug && 'enable' || 'disable' }}-debug --${{ matrix.zts && 'enable' || 'disable' }}-zts + asan: ${{ matrix.asan && 'true' || 'false' }} - name: make run: make -j$(/usr/bin/nproc) >/dev/null - name: make install