[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"
iluuu1994 · Oct 31, 2024 · ee19427 · ee19427
2 parents 9577734 + c9a30c9
commit ee19427
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -806,7 +806,7 @@ jobs:
       - name: Build mysql-8.0
         uses: ./.github/actions/build-libmysqlclient
         with:
-          configurationParameters: --enable-werror
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
           libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
           withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
       - name: Test mysql-8.0
@@ -816,7 +816,7 @@ jobs:
       - name: Build mysql-8.4
         uses: ./.github/actions/build-libmysqlclient
         with:
-          configurationParameters: --enable-werror
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
           libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
           withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
       - name: Test mysql-8.4