Skip to content

Commit 2580883

Browse files
committed
Fix nightly builds regarding libavif
Currently, we're running LINUX_X64 Asan builds on ubuntu-20.04, where libavif-dev is not available, so apt-x64 fails. This PR is a follow up to PR php#16049 to pass the respective parameter to apt-x64, and to fix the conditional check in configure-x64. It might be clearer to just have an `avif` parameter or to pass the runner version to these actions, but this should do for now. Closes phpGH-16130.
1 parent a1cc091 commit 2580883

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/actions/configure-x64/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ inputs:
66
skipSlow:
77
default: false
88
required: false
9+
asan:
10+
default: false
11+
required: false
912
runs:
1013
using: composite
1114
steps:
@@ -28,7 +31,7 @@ runs:
2831
--enable-gd \
2932
--with-jpeg \
3033
--with-webp \
31-
${{ inputs.skipSlow == 'false' && '--with-avif' || '' }} \
34+
${{ inputs.asan == 'false' && '--with-avif' || '' }} \
3235
--with-freetype \
3336
--with-xpm \
3437
--enable-exif \

.github/workflows/nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ jobs:
147147
uses: ./.github/actions/setup-mssql
148148
- name: apt
149149
uses: ./.github/actions/apt-x64
150+
with:
151+
asan: ${{ matrix.asan && 'true' || 'false' }}
150152
- name: System info
151153
run: |
152154
echo "::group::Show host CPU info"

0 commit comments

Comments
 (0)