mirror of
https://github.com/php/php-src.git
synced 2026-04-27 18:23:26 +02:00
Upgrade master to Ubuntu 24.04 (GH-16704)
This commit is contained in:
@@ -33,13 +33,11 @@ runs:
|
||||
libsodium-dev:i386 \
|
||||
libsqlite3-dev:i386 \
|
||||
libssl-dev:i386 \
|
||||
libtidy-dev:i386 \
|
||||
libwebp-dev:i386 \
|
||||
libxml2-dev:i386 \
|
||||
libxml2-dev:i386 \
|
||||
libxpm-dev:i386 \
|
||||
libxslt1-dev:i386 \
|
||||
libzip-dev:i386 \
|
||||
locales \
|
||||
make \
|
||||
pkg-config:i386 \
|
||||
|
||||
@@ -10,6 +10,7 @@ runs:
|
||||
run: |
|
||||
set -x
|
||||
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/i386-linux-gnu/pkgconfig"
|
||||
./buildconf --force
|
||||
export CFLAGS="-m32 -msse2"
|
||||
export CXXFLAGS="-m32 -msse2"
|
||||
@@ -33,12 +34,10 @@ runs:
|
||||
--with-freetype \
|
||||
--with-xpm \
|
||||
--enable-exif \
|
||||
--with-zip \
|
||||
--with-zlib \
|
||||
--enable-soap \
|
||||
--enable-xmlreader \
|
||||
--with-xsl \
|
||||
--with-tidy \
|
||||
--enable-sysvsem \
|
||||
--enable-sysvshm \
|
||||
--enable-shmop \
|
||||
|
||||
@@ -78,7 +78,7 @@ jobs:
|
||||
zts: true
|
||||
asan: true
|
||||
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
|
||||
runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 50
|
||||
steps:
|
||||
- name: git checkout
|
||||
@@ -142,7 +142,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 50
|
||||
container:
|
||||
image: ubuntu:20.04
|
||||
image: ubuntu:24.04
|
||||
env:
|
||||
MYSQL_TEST_HOST: mysql
|
||||
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
|
||||
@@ -255,7 +255,7 @@ jobs:
|
||||
BENCHMARKING:
|
||||
name: BENCHMARKING
|
||||
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 50
|
||||
steps:
|
||||
- name: git checkout
|
||||
|
||||
@@ -52,6 +52,9 @@ jobs:
|
||||
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
|
||||
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
|
||||
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
|
||||
ubuntu_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9) && '22.04' || '20.04' }}
|
||||
ubuntu_version: ${{
|
||||
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '24.04')
|
||||
|| ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) && '22.04')
|
||||
|| '20.04' }}
|
||||
windows_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '2022' || '2019' }}
|
||||
secrets: inherit
|
||||
|
||||
Reference in New Issue
Block a user