File tree Expand file tree Collapse file tree 3 files changed +17
-4
lines changed Expand file tree Collapse file tree 3 files changed +17
-4
lines changed Original file line number Diff line number Diff line change 5
5
required : false
6
6
libmysql :
7
7
required : true
8
+ withMysqli :
9
+ required : true
8
10
runs :
9
11
using : composite
10
12
steps :
@@ -20,13 +22,13 @@ runs:
20
22
wget -nv $URL
21
23
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
22
24
PDO_MYSQL=${MYSQL_DIR}
23
- MYSQLI=${MYSQL_DIR}/bin/mysql_config
25
+ ${{ inputs.withMysqli && ' MYSQLI=${MYSQL_DIR}/bin/mysql_config' }}
24
26
./buildconf --force
25
27
./configure ${{ inputs.configurationParameters }} \
26
28
--enable-option-checking=fatal \
27
29
--disable-all \
28
30
--enable-pdo \
29
31
--with-pdo-mysql=${PDO_MYSQL} \
30
- --with-mysqli=${MYSQLI}
32
+ ${{ inputs.withMysqli && ' --with-mysqli=${MYSQLI}' } }
31
33
make clean
32
34
make -j$(/usr/bin/nproc) >/dev/null
Original file line number Diff line number Diff line change 1
1
name : Test libmysqlclient
2
+ inputs :
3
+ withMysqli :
4
+ required : true
2
5
runs :
3
6
using : composite
4
7
steps :
5
8
- shell : bash
6
9
run : |
7
10
set -x
8
- export MYSQL_TEST_USER=root
9
- export MYSQL_TEST_PASSWD=root
11
+ ${{ inputs.withMysqli && ' export MYSQL_TEST_USER=root' }}
12
+ ${{ inputs.withMysqli && ' export MYSQL_TEST_PASSWD=root' }}
10
13
export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
11
14
export PDO_MYSQL_TEST_HOST=127.0.0.1
12
15
export PDO_MYSQL_TEST_USER=root
Original file line number Diff line number Diff line change @@ -458,6 +458,8 @@ jobs:
458
458
fail-fast : false
459
459
matrix :
460
460
branch : ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
461
+ exclude :
462
+ - branch : { name: 'PHP-80', ref: 'PHP-8.0' }
461
463
name : " ${{ matrix.branch.name }}_LIBMYSQLCLIENT"
462
464
runs-on : ubuntu-20.04
463
465
steps :
@@ -486,15 +488,21 @@ jobs:
486
488
uses : ./.github/actions/build-libmysqlclient
487
489
with :
488
490
libmysql : mysql-5.7.38-linux-glibc2.12-x86_64.tar.gz
491
+ withMysqli : ${{ matrix.branch.ref == 'PHP-8.1' }}
489
492
- name : Test mysql-5.7
490
493
uses : ./.github/actions/test-libmysqlclient
494
+ with :
495
+ withMysqli : ${{ matrix.branch.ref == 'PHP-8.1' }}
491
496
- name : Build mysql-8.0
492
497
uses : ./.github/actions/build-libmysqlclient
493
498
with :
494
499
# FIXME: There are new warnings
495
500
# configurationParameters: --enable-werror
496
501
libmysql : mysql-8.0.30-linux-glibc2.12-x86_64.tar.xz
502
+ withMysqli : ${{ matrix.branch.ref == 'PHP-8.1' }}
497
503
- name : Test mysql-8.0
498
504
uses : ./.github/actions/test-libmysqlclient
505
+ with :
506
+ withMysqli : ${{ matrix.branch.ref == 'PHP-8.1' }}
499
507
- name : Verify generated files are up to date
500
508
uses : ./.github/actions/verify-generated-files
You can’t perform that action at this time.
0 commit comments