From 30d5b7121c65e3fabf4408ec42e42b8e3cef5ba2 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Mon, 22 Dec 2025 12:52:22 -0800 Subject: [PATCH 1/4] root.yml: drop more 8.1 CI configuration [skip ci] --- .github/workflows/root.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml index 767a853e7c8ff..abb465ad8b942 100644 --- a/.github/workflows/root.yml +++ b/.github/workflows/root.yml @@ -46,7 +46,7 @@ jobs: || '22.04' }} branch: ${{ matrix.branch.ref }} community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }} - libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }} + libmysqlclient_with_mysqli: false run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }} run_linux_ppc64: ${{ (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 }} @@ -56,8 +56,8 @@ jobs: || '22.04' }} windows_version: '2022' vs_crt_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) && 'vs17') || 'vs16' }} - skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }} + skip_laravel: false symfony_version: ${{ (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '8.1') || '7.4' }} - skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }} + skip_wordpress: false variation_enable_zend_max_execution_timers: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }} secrets: inherit From d55b0b7a07895d22a1a566bc6a4ad78cc79e20b6 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Tue, 13 Jan 2026 14:24:51 -0800 Subject: [PATCH 2/4] Remove libmysqlclient_with_mysqli --- .github/workflows/nightly.yml | 19 ++++++++----------- .github/workflows/root.yml | 1 - 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 00e2cbb43c233..9236e0640a578 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,9 +11,6 @@ on: community_verify_type_inference: required: true type: boolean - libmysqlclient_with_mysqli: - required: true - type: boolean run_alpine: required: true type: boolean @@ -854,25 +851,25 @@ jobs: - name: Build mysql-8.0 uses: ./.github/actions/build-libmysqlclient with: - configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }} + configurationParameters: '--enable-werror' libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz - withMysqli: ${{ inputs.libmysqlclient_with_mysqli }} + withMysqli: false - name: Test mysql-8.0 uses: ./.github/actions/test-libmysqlclient with: - withMysqli: ${{ inputs.libmysqlclient_with_mysqli }} + withMysqli: false - name: Build mysql-8.4 - if: ${{ !inputs.libmysqlclient_with_mysqli }} + if: true uses: ./.github/actions/build-libmysqlclient with: - configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }} + configurationParameters: '--enable-werror' libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz - withMysqli: ${{ inputs.libmysqlclient_with_mysqli }} + withMysqli: false - name: Test mysql-8.4 - if: ${{ !inputs.libmysqlclient_with_mysqli }} + if: true uses: ./.github/actions/test-libmysqlclient with: - withMysqli: ${{ inputs.libmysqlclient_with_mysqli }} + withMysqli: false - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files PECL: diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml index abb465ad8b942..6958a9cd4147b 100644 --- a/.github/workflows/root.yml +++ b/.github/workflows/root.yml @@ -46,7 +46,6 @@ jobs: || '22.04' }} branch: ${{ matrix.branch.ref }} community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }} - libmysqlclient_with_mysqli: false run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }} run_linux_ppc64: ${{ (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 }} From ea26bd40c7277ae225bcdc9f341ee2493afced4e Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Tue, 13 Jan 2026 14:26:47 -0800 Subject: [PATCH 3/4] Cleanup if: true --- .github/workflows/nightly.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9236e0640a578..cc291601bf921 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -859,14 +859,12 @@ jobs: with: withMysqli: false - name: Build mysql-8.4 - if: true uses: ./.github/actions/build-libmysqlclient with: configurationParameters: '--enable-werror' libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz withMysqli: false - name: Test mysql-8.4 - if: true uses: ./.github/actions/test-libmysqlclient with: withMysqli: false From c1dbd0db37a5fe9c8bfdfae7a90bf9702c593483 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Tue, 13 Jan 2026 14:28:32 -0800 Subject: [PATCH 4/4] Remove withMysqli --- .github/actions/build-libmysqlclient/action.yml | 6 +----- .github/actions/test-libmysqlclient/action.yml | 5 ----- .github/workflows/nightly.yml | 6 ------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/actions/build-libmysqlclient/action.yml b/.github/actions/build-libmysqlclient/action.yml index bab2bc544a128..632c1e8ea16b5 100644 --- a/.github/actions/build-libmysqlclient/action.yml +++ b/.github/actions/build-libmysqlclient/action.yml @@ -5,8 +5,6 @@ inputs: required: false libmysql: required: true - withMysqli: - required: true runs: using: composite steps: @@ -21,13 +19,11 @@ runs: wget -nv $URL tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR PDO_MYSQL=${MYSQL_DIR} - ${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }} ./buildconf --force ./configure ${{ inputs.configurationParameters }} \ --enable-option-checking=fatal \ --disable-all \ --enable-pdo \ - --with-pdo-mysql=${PDO_MYSQL} \ - ${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }} + --with-pdo-mysql=${PDO_MYSQL} make clean make -j$(/usr/bin/nproc) >/dev/null diff --git a/.github/actions/test-libmysqlclient/action.yml b/.github/actions/test-libmysqlclient/action.yml index 74474225e6705..185e909f96583 100644 --- a/.github/actions/test-libmysqlclient/action.yml +++ b/.github/actions/test-libmysqlclient/action.yml @@ -1,15 +1,10 @@ name: Test libmysqlclient -inputs: - withMysqli: - required: true runs: using: composite steps: - shell: bash run: | set -x - ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }} - ${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }} export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test" export PDO_MYSQL_TEST_HOST=127.0.0.1 export PDO_MYSQL_TEST_USER=root diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cc291601bf921..b898ed34515bd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -853,21 +853,15 @@ jobs: with: configurationParameters: '--enable-werror' libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz - withMysqli: false - name: Test mysql-8.0 uses: ./.github/actions/test-libmysqlclient - with: - withMysqli: false - name: Build mysql-8.4 uses: ./.github/actions/build-libmysqlclient with: configurationParameters: '--enable-werror' libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz - withMysqli: false - name: Test mysql-8.4 uses: ./.github/actions/test-libmysqlclient - with: - withMysqli: false - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files PECL: