From 8a067cc221365b18c26919c2088c70aab351e004 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Thu, 31 Oct 2024 13:40:26 +0100 Subject: [PATCH 1/2] [skip ci] Revert "Remove -Werror for libmysql test on 8.1 only" This reverts commit 769947648ef946b2dbe49029ea78ed13377dd1d4. Nightly uses the file from master, so this change made no sense. --- .github/workflows/nightly.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index de79cc780741f..3c59dacbdded0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -806,6 +806,7 @@ jobs: - name: Build mysql-8.0 uses: ./.github/actions/build-libmysqlclient with: + 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 @@ -815,6 +816,7 @@ jobs: - name: Build mysql-8.4 uses: ./.github/actions/build-libmysqlclient with: + 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 From 6c8a0d01637f728f24d5f4b850e2b848e5b582a5 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Thu, 31 Oct 2024 13:43:39 +0100 Subject: [PATCH 2/2] [skip ci] Properly disable -Werror for libmysqlclient + mysqli --- .github/workflows/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3c59dacbdded0..b87b7389ef02d 100644 --- 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