Skip to content

Commit 9685d74

Browse files
committed
Upgrade master to Ubuntu 24.04
1 parent 5c5b162 commit 9685d74

File tree

5 files changed

+6
-21
lines changed

5 files changed

+6
-21
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/apt-x64/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runs:
4848
libedit-dev \
4949
libldap2-dev \
5050
libsodium-dev \
51-
libargon2-0-dev \
51+
libargon2-dev \
5252
libmm-dev \
5353
libsnmp-dev \
5454
postgresql \

.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
@@ -77,5 +77,4 @@ runs:
7777
--with-config-file-scan-dir=/etc/php.d \
7878
${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
7979
${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
80-
--enable-werror \
8180
${{ inputs.configurationParameters }}

.github/workflows/push.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,13 @@ jobs:
7676
zts: true
7777
asan: true
7878
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
79-
runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
79+
runs-on: ubuntu-24.04
8080
timeout-minutes: 50
81-
container:
82-
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
8381
steps:
8482
- name: git checkout
8583
uses: actions/checkout@v4
8684
- name: apt
8785
uses: ./.github/actions/apt-x64
88-
- name: LLVM 16 (ASAN-only)
89-
if: ${{ matrix.asan }}
90-
run: |
91-
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y lsb-release wget software-properties-common gnupg
92-
wget https://apt.llvm.org/llvm.sh
93-
chmod u+x llvm.sh
94-
sudo ./llvm.sh 16
9586
- name: System info
9687
run: |
9788
echo "::group::Show host CPU info"
@@ -149,7 +140,7 @@ jobs:
149140
runs-on: ubuntu-latest
150141
timeout-minutes: 50
151142
container:
152-
image: ubuntu:20.04
143+
image: ubuntu:24.04
153144
env:
154145
MYSQL_TEST_HOST: mysql
155146
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
@@ -190,7 +181,7 @@ jobs:
190181
-d zend_extension=opcache.so
191182
-d opcache.enable_cli=1
192183
MACOS_DEBUG_NTS:
193-
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
184+
if: false
194185
strategy:
195186
fail-fast: false
196187
matrix:
@@ -233,7 +224,7 @@ jobs:
233224
- name: Verify generated files are up to date
234225
uses: ./.github/actions/verify-generated-files
235226
WINDOWS:
236-
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
227+
if: false
237228
name: WINDOWS_X64_ZTS
238229
runs-on: windows-2022
239230
timeout-minutes: 50
@@ -262,7 +253,7 @@ jobs:
262253
BENCHMARKING:
263254
name: BENCHMARKING
264255
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
265-
runs-on: ubuntu-22.04
256+
runs-on: ubuntu-24.04
266257
timeout-minutes: 50
267258
steps:
268259
- name: git checkout

0 commit comments

Comments
 (0)