Skip to content

Commit ee19427

Browse files
committed
[skip ci] Merge branch 'PHP-8.4'
* PHP-8.4: [skip ci] Properly disable -Werror for libmysqlclient + mysqli [skip ci] Revert "Remove -Werror for libmysql test on 8.1 only"
2 parents 9577734 + c9a30c9 commit ee19427

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ jobs:
806806
- name: Build mysql-8.0
807807
uses: ./.github/actions/build-libmysqlclient
808808
with:
809-
configurationParameters: --enable-werror
809+
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
810810
libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
811811
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
812812
- name: Test mysql-8.0
@@ -816,7 +816,7 @@ jobs:
816816
- name: Build mysql-8.4
817817
uses: ./.github/actions/build-libmysqlclient
818818
with:
819-
configurationParameters: --enable-werror
819+
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
820820
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
821821
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
822822
- name: Test mysql-8.4

0 commit comments

Comments
 (0)