Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/actions/build-libmysqlclient/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ inputs:
required: false
libmysql:
required: true
withMysqli:
required: true
runs:
using: composite
steps:
Expand All @@ -21,13 +19,11 @@ runs:
wget -nv $URL
tar -xf $LIBMYSQL --strip-components=1 -C $MYSQL_DIR
PDO_MYSQL=${MYSQL_DIR}
${{ 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 == 'true' && '--with-mysqli=${MYSQLI}' || '' }}
--with-pdo-mysql=${PDO_MYSQL}
make clean
make -j$(/usr/bin/nproc) >/dev/null
5 changes: 0 additions & 5 deletions .github/actions/test-libmysqlclient/action.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
name: Test libmysqlclient
inputs:
withMysqli:
required: true
runs:
using: composite
steps:
- shell: bash
run: |
set -x
${{ 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
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
community_verify_type_inference:
required: true
type: boolean
libmysqlclient_with_mysqli:
required: true
type: boolean
run_alpine:
required: true
type: boolean
Expand Down Expand Up @@ -854,25 +851,17 @@ jobs:
- name: Build mysql-8.0
uses: ./.github/actions/build-libmysqlclient
with:
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
configurationParameters: '--enable-werror'
libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Test mysql-8.0
uses: ./.github/actions/test-libmysqlclient
with:
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Build mysql-8.4
if: ${{ !inputs.libmysqlclient_with_mysqli }}
uses: ./.github/actions/build-libmysqlclient
with:
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
configurationParameters: '--enable-werror'
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Test mysql-8.4
if: ${{ !inputs.libmysqlclient_with_mysqli }}
uses: ./.github/actions/test-libmysqlclient
with:
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
PECL:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
|| '22.04' }}
branch: ${{ matrix.branch.ref }}
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
Expand All @@ -56,8 +55,8 @@ jobs:
|| '22.04' }}
windows_version: '2022'
vs_crt_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) && 'vs17') || 'vs16' }}
skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
skip_laravel: false
symfony_version: ${{ (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '8.1') || '7.4' }}
skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
skip_wordpress: false
variation_enable_zend_max_execution_timers: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
secrets: inherit
Loading