mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.4'
* PHP-8.4: Fix missing libavif-dev in asan nightly
This commit is contained in:
commit
553e18f679
3 changed files with 7 additions and 2 deletions
6
.github/actions/apt-x64/action.yml
vendored
6
.github/actions/apt-x64/action.yml
vendored
|
@ -1,4 +1,8 @@
|
||||||
name: apt
|
name: apt
|
||||||
|
inputs:
|
||||||
|
asan:
|
||||||
|
default: false
|
||||||
|
required: false
|
||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
steps:
|
steps:
|
||||||
|
@ -39,7 +43,7 @@ runs:
|
||||||
libsqlite3-dev \
|
libsqlite3-dev \
|
||||||
libsqlite3-mod-spatialite \
|
libsqlite3-mod-spatialite \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
libavif-dev \
|
${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \
|
||||||
libonig-dev \
|
libonig-dev \
|
||||||
libcurl4-openssl-dev \
|
libcurl4-openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
|
2
.github/actions/configure-x64/action.yml
vendored
2
.github/actions/configure-x64/action.yml
vendored
|
@ -28,7 +28,7 @@ runs:
|
||||||
--enable-gd \
|
--enable-gd \
|
||||||
--with-jpeg \
|
--with-jpeg \
|
||||||
--with-webp \
|
--with-webp \
|
||||||
--with-avif \
|
${{ inputs.skipSlow == 'false' && '--with-avif' || '' }} \
|
||||||
--with-freetype \
|
--with-freetype \
|
||||||
--with-xpm \
|
--with-xpm \
|
||||||
--enable-exif \
|
--enable-exif \
|
||||||
|
|
1
.github/workflows/nightly.yml
vendored
1
.github/workflows/nightly.yml
vendored
|
@ -162,6 +162,7 @@ jobs:
|
||||||
${{ matrix.configuration_parameters }}
|
${{ matrix.configuration_parameters }}
|
||||||
--${{ matrix.debug && 'enable' || 'disable' }}-debug
|
--${{ matrix.debug && 'enable' || 'disable' }}-debug
|
||||||
--${{ matrix.zts && 'enable' || 'disable' }}-zts
|
--${{ matrix.zts && 'enable' || 'disable' }}-zts
|
||||||
|
asan: ${{ matrix.asan && 'true' || 'false' }}
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j$(/usr/bin/nproc) >/dev/null
|
run: make -j$(/usr/bin/nproc) >/dev/null
|
||||||
- name: make install
|
- name: make install
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue