Skip to content

Commit c1dbd0d

Browse files
Remove withMysqli
1 parent ea26bd4 commit c1dbd0d

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ inputs:
55
required: false
66
libmysql:
77
required: true
8-
withMysqli:
9-
required: true
108
runs:
119
using: composite
1210
steps:
@@ -21,13 +19,11 @@ runs:
2119
wget -nv $URL
2220
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
2321
PDO_MYSQL=${MYSQL_DIR}
24-
${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }}
2522
./buildconf --force
2623
./configure ${{ inputs.configurationParameters }} \
2724
--enable-option-checking=fatal \
2825
--disable-all \
2926
--enable-pdo \
30-
--with-pdo-mysql=${PDO_MYSQL} \
31-
${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
27+
--with-pdo-mysql=${PDO_MYSQL}
3228
make clean
3329
make -j$(/usr/bin/nproc) >/dev/null

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
name: Test libmysqlclient
2-
inputs:
3-
withMysqli:
4-
required: true
52
runs:
63
using: composite
74
steps:
85
- shell: bash
96
run: |
107
set -x
11-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }}
12-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }}
138
export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
149
export PDO_MYSQL_TEST_HOST=127.0.0.1
1510
export PDO_MYSQL_TEST_USER=root

.github/workflows/nightly.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -853,21 +853,15 @@ jobs:
853853
with:
854854
configurationParameters: '--enable-werror'
855855
libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
856-
withMysqli: false
857856
- name: Test mysql-8.0
858857
uses: ./.github/actions/test-libmysqlclient
859-
with:
860-
withMysqli: false
861858
- name: Build mysql-8.4
862859
uses: ./.github/actions/build-libmysqlclient
863860
with:
864861
configurationParameters: '--enable-werror'
865862
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
866-
withMysqli: false
867863
- name: Test mysql-8.4
868864
uses: ./.github/actions/test-libmysqlclient
869-
with:
870-
withMysqli: false
871865
- name: Verify generated files are up to date
872866
uses: ./.github/actions/verify-generated-files
873867
PECL:

0 commit comments

Comments
 (0)