Skip to content

Commit 60d2d7e

Browse files
committed
Update libmysqlclient versions
5.7 is EOL, 8.2 was released. Also remove mysqli from these builds as PHP-8.1 goes into security mode, after which nightly is not really actively supported anymore.
1 parent 2895d4a commit 60d2d7e

File tree

4 files changed

+58
-30
lines changed

4 files changed

+58
-30
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:
@@ -22,13 +20,11 @@ runs:
2220
wget -nv $URL
2321
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
2422
PDO_MYSQL=${MYSQL_DIR}
25-
${{ inputs.withMysqli == 'true' && 'MYSQLI=${MYSQL_DIR}/bin/mysql_config' || '' }}
2623
./buildconf --force
2724
./configure ${{ inputs.configurationParameters }} \
2825
--enable-option-checking=fatal \
2926
--disable-all \
3027
--enable-pdo \
31-
--with-pdo-mysql=${PDO_MYSQL} \
32-
${{ inputs.withMysqli == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
28+
--with-pdo-mysql=${PDO_MYSQL} || cat config.log
3329
make clean
3430
make -j$(/usr/bin/nproc) >/dev/null

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
name: Test libmysqlclient
22
inputs:
3-
withMysqli:
4-
required: true
53
runs:
64
using: composite
75
steps:
86
- shell: bash
97
run: |
108
set -x
11-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_USER=root' || '' }}
12-
${{ inputs.withMysqli == 'true' && 'export MYSQL_TEST_PASSWD=root' || '' }}
139
export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
1410
export PDO_MYSQL_TEST_HOST=127.0.0.1
1511
export PDO_MYSQL_TEST_USER=root

.github/workflows/nightly.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ jobs:
697697
matrix:
698698
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
699699
exclude:
700-
- branch: { name: 'PHP-80', ref: 'PHP-8.0' }
700+
- branch: { name: 'PHP-80', ref: 'PHP-8.0', major: 8, minor: 0 }
701701
name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
702702
runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }}
703703
steps:
@@ -715,33 +715,22 @@ jobs:
715715
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
716716
# Ensure local_infile tests can run.
717717
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
718-
# Does not support caching_sha2_auth :(
719-
# - name: Build mysql-5.6
720-
# uses: ./.github/actions/build-libmysqlclient
721-
# with:
722-
# libmysql: mysql-5.6.49-linux-glibc2.12-x86_64.tar.gz
723-
# - name: Test mysql-5.6
724-
# uses: ./.github/actions/test-libmysqlclient
725-
- name: Build mysql-5.7
726-
uses: ./.github/actions/build-libmysqlclient
727-
with:
728-
libmysql: mysql-5.7.44-linux-glibc2.12-x86_64.tar.gz
729-
withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
730-
- name: Test mysql-5.7
731-
uses: ./.github/actions/test-libmysqlclient
732-
with:
733-
withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
734718
- name: Build mysql-8.0
735719
uses: ./.github/actions/build-libmysqlclient
736720
with:
737721
# FIXME: There are new warnings
738722
# configurationParameters: --enable-werror
739-
libmysql: mysql-8.0.35-linux-glibc2.12-x86_64.tar.xz
740-
withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
723+
libmysql: mysql-8.0.35-linux-glibc2.28-x86_64.tar.xz
741724
- name: Test mysql-8.0
742725
uses: ./.github/actions/test-libmysqlclient
726+
- name: Build mysql-8.2
727+
uses: ./.github/actions/build-libmysqlclient
743728
with:
744-
withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
729+
# FIXME: There are new warnings
730+
# configurationParameters: --enable-werror
731+
libmysql: mysql-8.2.0-linux-glibc2.28-x86_64.tar.xz
732+
- name: Test mysql-8.2
733+
uses: ./.github/actions/test-libmysqlclient
745734
- name: Verify generated files are up to date
746735
uses: ./.github/actions/verify-generated-files
747736
- name: Notify Slack

.github/workflows/push.yml

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ env:
4545
CXX: ccache g++
4646
jobs:
4747
LINUX_X64:
48+
if: false
4849
services:
4950
mysql:
5051
image: mysql:8
@@ -141,6 +142,7 @@ jobs:
141142
if: ${{ !matrix.asan }}
142143
uses: ./.github/actions/verify-generated-files
143144
MACOS_DEBUG_NTS:
145+
if: false
144146
runs-on: macos-12
145147
steps:
146148
- name: git checkout
@@ -173,6 +175,7 @@ jobs:
173175
- name: Verify generated files are up to date
174176
uses: ./.github/actions/verify-generated-files
175177
WINDOWS:
178+
if: false
176179
name: WINDOWS_X64_ZTS
177180
runs-on: windows-2019
178181
env:
@@ -199,7 +202,8 @@ jobs:
199202
run: .github/scripts/windows/test.bat
200203
BENCHMARKING:
201204
name: BENCHMARKING
202-
if: github.repository_owner == 'php' || github.event_name == 'pull_request'
205+
if: false
206+
# if: github.repository_owner == 'php' || github.event_name == 'pull_request'
203207
runs-on: ubuntu-22.04
204208
steps:
205209
- name: git checkout
@@ -298,3 +302,46 @@ jobs:
298302
name: profiles
299303
path: ${{ github.workspace }}/benchmark/profiles
300304
retention-days: 30
305+
LIBMYSQLCLIENT:
306+
strategy:
307+
fail-fast: false
308+
matrix:
309+
include:
310+
- branch: { name: 'MASTER', ref: 'master', version: { major: 8, minor: 4 } }
311+
- branch: { name: 'PHP-83', ref: 'PHP-8.3', version: { major: 8, minor: 3 } }
312+
- branch: { name: 'PHP-82', ref: 'PHP-8.2', version: { major: 8, minor: 2 } }
313+
name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
314+
runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }}
315+
steps:
316+
- name: git checkout
317+
uses: actions/checkout@v4
318+
with:
319+
ref: ${{ matrix.branch.ref }}
320+
- name: apt
321+
run: |
322+
sudo apt-get update -y | true
323+
sudo apt install bison re2c
324+
- name: Setup
325+
run: |
326+
sudo service mysql start
327+
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
328+
# Ensure local_infile tests can run.
329+
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
330+
- name: Build mysql-8.0
331+
uses: ./.github/actions/build-libmysqlclient
332+
with:
333+
# FIXME: There are new warnings
334+
# configurationParameters: --enable-werror
335+
libmysql: mysql-8.0.35-linux-glibc2.28-x86_64.tar.xz
336+
- name: Test mysql-8.0
337+
uses: ./.github/actions/test-libmysqlclient
338+
- name: Build mysql-8.2
339+
uses: ./.github/actions/build-libmysqlclient
340+
with:
341+
# FIXME: There are new warnings
342+
# configurationParameters: --enable-werror
343+
libmysql: mysql-8.2.0-linux-glibc2.28-x86_64.tar.xz
344+
- name: Test mysql-8.2
345+
uses: ./.github/actions/test-libmysqlclient
346+
- name: Verify generated files are up to date
347+
uses: ./.github/actions/verify-generated-files

0 commit comments

Comments
 (0)