mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: [skip ci] Fix libmysqlclient build for >=PHP-8.2
This commit is contained in:
commit
d644600ddd
@ -22,13 +22,13 @@ runs:
|
||||
wget -nv $URL
|
||||
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
|
||||
PDO_MYSQL=${MYSQL_DIR}
|
||||
${{ inputs.withMysqli && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' }}
|
||||
${{ 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 && '--with-mysqli=${MYSQLI}' }}
|
||||
${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
|
||||
make clean
|
||||
make -j$(/usr/bin/nproc) >/dev/null
|
||||
|
@ -8,8 +8,8 @@ runs:
|
||||
- shell: bash
|
||||
run: |
|
||||
set -x
|
||||
${{ inputs.withMysqli && 'export MYSQL_TEST_USER=root' }}
|
||||
${{ inputs.withMysqli && 'export MYSQL_TEST_PASSWD=root' }}
|
||||
${{ 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
|
||||
|
Loading…
Reference in New Issue
Block a user