From 12621549ac605568e32635b0eb9e78cc7d0705d9 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 20 Nov 2026 15:20:33 +0000 Subject: [PATCH 1/3] Test on PHP 8.6 STF-2474 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/test-bundled.yml | 2 +- .github/workflows/test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-bundled.yml b/.github/workflows/test-bundled.yml index c313416..8c67b6e 100644 --- a/.github/workflows/test-bundled.yml +++ b/.github/workflows/test-bundled.yml @@ -34,7 +34,7 @@ jobs: fail-fast: false matrix: arch: ["amd64", "arm64v8"] - php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] + php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6'] include: - arch: amd64 runner: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85489ee..1db84bd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, ubuntu-24.04-arm] - php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] + php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6'] php-extension: ['bcmath', 'gmp'] include: # The runner's PHP loads gmp by default, and the decoder uses gmp @@ -23,9 +23,9 @@ jobs: disabled-extensions: ':gmp' # Two PHP versions on each OS are enough to find platform problems. - { os: macos-latest, php-version: '8.1', php-extension: gmp } - - { os: macos-latest, php-version: '8.5', php-extension: gmp } + - { os: macos-latest, php-version: '8.6', php-extension: gmp } - { os: windows-latest, php-version: '8.1', php-extension: gmp } - - { os: windows-latest, php-version: '8.5', php-extension: gmp } + - { os: windows-latest, php-version: '8.6', php-extension: gmp } name: "PHP ${{ matrix.php-version }} (with ${{ matrix.php-extension }}) test on ${{ matrix.os }}" defaults: From 422e512dd49b5a083bf1338699c434d7b788dbc9 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 20 Nov 2026 15:30:46 +0000 Subject: [PATCH 2/3] Remove libmaxminddb-dev from the bundled-build container The shivammathur/node image has PHP 7.2 to 8.5. For PHP 8.6, setup-php installs a shivammathur/php-builder build, and that installs libmaxminddb-dev. The bundled-build check then fails because a system libmaxminddb is present. STF-2474 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/test-bundled.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test-bundled.yml b/.github/workflows/test-bundled.yml index 8c67b6e..1f60afb 100644 --- a/.github/workflows/test-bundled.yml +++ b/.github/workflows/test-bundled.yml @@ -57,6 +57,14 @@ jobs: submodules: true persist-credentials: false + # The image has PHP 7.2 to 8.5. For a newer PHP, setup-php installs a + # shivammathur/php-builder build, and that installs libmaxminddb-dev. + - name: Remove the libmaxminddb-dev that php-builder installs + run: | + if dpkg -s libmaxminddb-dev >/dev/null 2>&1; then + apt-get remove -y libmaxminddb-dev + fi + # We deliberately do not install libmaxminddb, and we do not set # PKG_CONFIG_PATH, so that the build cannot silently fall back to a # system library. From 057090b0d2f8b7b745bd8155926de33035fc019b Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 20 Nov 2026 15:30:46 +0000 Subject: [PATCH 3/3] Run AddressSanitizer on PHP 8.6.0 STF-2474 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/clang-addresssanitizer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clang-addresssanitizer.yml b/.github/workflows/clang-addresssanitizer.yml index 399fa48..68db85f 100644 --- a/.github/workflows/clang-addresssanitizer.yml +++ b/.github/workflows/clang-addresssanitizer.yml @@ -38,9 +38,9 @@ jobs: # building PHP from source with ASan linked works around the issue. - name: Install PHP run: | - wget https://www.php.net/distributions/php-8.5.12.tar.gz - tar xzf php-8.5.12.tar.gz - cd php-8.5.12 + wget https://www.php.net/distributions/php-8.6.0.tar.gz + tar xzf php-8.6.0.tar.gz + cd php-8.6.0 ./configure --with-openssl --with-curl --with-zlib --enable-mbstring --enable-intl --with-zip make -j2 sudo make install