Skip to content

Commit cdba271

Browse files
committed
Upgrade master to Ubuntu 24.04
1 parent 5fc238f commit cdba271

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.github/actions/apt-x32/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ runs:
3333
libsodium-dev:i386 \
3434
libsqlite3-dev:i386 \
3535
libssl-dev:i386 \
36-
libtidy-dev:i386 \
3736
libwebp-dev:i386 \
3837
libxml2-dev:i386 \
3938
libxml2-dev:i386 \
4039
libxpm-dev:i386 \
4140
libxslt1-dev:i386 \
42-
libzip-dev:i386 \
4341
locales \
4442
make \
4543
pkg-config:i386 \

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ runs:
3333
--with-freetype \
3434
--with-xpm \
3535
--enable-exif \
36-
--with-zip \
3736
--with-zlib \
3837
--enable-soap \
3938
--enable-xmlreader \
4039
--with-xsl \
41-
--with-tidy \
4240
--enable-sysvsem \
4341
--enable-sysvshm \
4442
--enable-shmop \
@@ -61,6 +59,5 @@ runs:
6159
--with-mhash \
6260
--with-sodium \
6361
--enable-dba \
64-
--enable-werror \
6562
--with-config-file-path=/etc \
6663
--with-config-file-scan-dir=/etc/php.d

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ runs:
8080
--with-config-file-scan-dir=/etc/php.d \
8181
${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
8282
${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
83-
--enable-werror \
8483
${{ inputs.configurationParameters }}

.github/workflows/push.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
zts: true
7979
asan: true
8080
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
81-
runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
81+
runs-on: ubuntu-24.04
8282
timeout-minutes: 50
8383
steps:
8484
- name: git checkout
@@ -142,7 +142,7 @@ jobs:
142142
runs-on: ubuntu-latest
143143
timeout-minutes: 50
144144
container:
145-
image: ubuntu:20.04
145+
image: ubuntu:24.04
146146
env:
147147
MYSQL_TEST_HOST: mysql
148148
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
@@ -183,7 +183,7 @@ jobs:
183183
-d zend_extension=opcache.so
184184
-d opcache.enable_cli=1
185185
MACOS_DEBUG_NTS:
186-
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
186+
if: false
187187
strategy:
188188
fail-fast: false
189189
matrix:
@@ -226,7 +226,7 @@ jobs:
226226
- name: Verify generated files are up to date
227227
uses: ./.github/actions/verify-generated-files
228228
WINDOWS:
229-
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
229+
if: false
230230
name: WINDOWS_X64_ZTS
231231
runs-on: windows-2022
232232
timeout-minutes: 50
@@ -255,7 +255,7 @@ jobs:
255255
BENCHMARKING:
256256
name: BENCHMARKING
257257
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
258-
runs-on: ubuntu-22.04
258+
runs-on: ubuntu-24.04
259259
timeout-minutes: 50
260260
steps:
261261
- name: git checkout

0 commit comments

Comments
 (0)