Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  [skip ci] Attempt to fix libmysqlclient build for >=PHP-8.2

.github/actions/build-libmysqlclient/action.yml

@@ -5,6 +5,8 @@ inputs:
     required: false
   libmysql:
     required: true
+  withMysqli:
+    required: true
 runs:
   using: composite
   steps:
@@ -20,13 +22,13 @@ runs:
         wget -nv $URL
         tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
         PDO_MYSQL=${MYSQL_DIR}
-        MYSQLI=${MYSQL_DIR}/bin/mysql_config
+        ${{ inputs.withMysqli && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' }}
         ./buildconf --force
         ./configure ${{ inputs.configurationParameters }} \
           --enable-option-checking=fatal \
           --disable-all \
           --enable-pdo \
           --with-pdo-mysql=${PDO_MYSQL} \
-          --with-mysqli=${MYSQLI}
+          ${{ inputs.withMysqli && '--with-mysqli=${MYSQLI}' }}
         make clean
         make -j$(/usr/bin/nproc) >/dev/null

.github/actions/test-libmysqlclient/action.yml

@@ -1,12 +1,15 @@
 name: Test libmysqlclient
+inputs:
+  withMysqli:
+    required: true
 runs:
   using: composite
   steps:
     - shell: bash
       run: |
         set -x
-        export MYSQL_TEST_USER=root
-        export MYSQL_TEST_PASSWD=root
+        ${{ inputs.withMysqli && 'export MYSQL_TEST_USER=root' }}
+        ${{ inputs.withMysqli && '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

.github/workflows/nightly.yml

@@ -467,6 +467,8 @@ jobs:
       fail-fast: false
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
+        exclude:
+          - branch: { name: 'PHP-80', ref: 'PHP-8.0' }
     name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
     runs-on: ubuntu-20.04
     steps:
@@ -495,15 +497,21 @@ jobs:
         uses: ./.github/actions/build-libmysqlclient
         with:
           libmysql: mysql-5.7.38-linux-glibc2.12-x86_64.tar.gz
+          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-5.7
         uses: ./.github/actions/test-libmysqlclient
+        with:
+          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Build mysql-8.0
         uses: ./.github/actions/build-libmysqlclient
         with:
           # FIXME: There are new warnings
           # configurationParameters: --enable-werror
           libmysql: mysql-8.0.30-linux-glibc2.12-x86_64.tar.xz
+          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient
+        with:
+          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files