From 4d59558c5604d29807a37ededd7b1ec02d8d9a9e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 20 Sep 2024 13:34:53 +0200
Subject: CI: Migrate compile flags environment variables to new cmake option
 WITH_WARNINGS_AS_ERRORS

---
 .github/workflows/gcc-build.yml       | 4 +---
 .github/workflows/macos-arm-build.yml | 4 +---
 .github/workflows/win-x64-build.yml   | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml
index 2d51498a0dd..6f1765801cf 100644
--- a/.github/workflows/gcc-build.yml
+++ b/.github/workflows/gcc-build.yml
@@ -20,12 +20,10 @@ jobs:
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
     - name: Setup
       env:
-        CFLAGS: -Werror
-        CXXFLAGS: -Werror
         CMAKE_BUILD_TYPE: Debug
       run: >
         cmake -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
-        -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
         -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG"
         -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
     - name: Build
diff --git a/.github/workflows/macos-arm-build.yml b/.github/workflows/macos-arm-build.yml
index fb353fd5ba3..b6497abc81a 100644
--- a/.github/workflows/macos-arm-build.yml
+++ b/.github/workflows/macos-arm-build.yml
@@ -37,12 +37,10 @@ jobs:
         
     - name: Configure CMake
       env:
-        CFLAGS: -Werror
-        CXXFLAGS: -Werror
         CMAKE_BUILD_TYPE: Debug
       run: >
         cmake -GNinja -B ${{ steps.strings.outputs.build-output-dir }}
-        -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DBUILD_TESTING=1
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DBUILD_TESTING=1
         -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG"
         -DCMAKE_INSTALL_PREFIX=check_install
         -S ${{ github.workspace }}
diff --git a/.github/workflows/win-x64-build.yml b/.github/workflows/win-x64-build.yml
index b659f4e778c..eae7d689836 100644
--- a/.github/workflows/win-x64-build.yml
+++ b/.github/workflows/win-x64-build.yml
@@ -71,12 +71,10 @@ jobs:
 
     - name: Configure CMake
       env:
-        CFLAGS: /WX
-        CXXFLAGS: /WX
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
       run: >
         cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
-        -DTOOLS=ON
+        -DWITH_WARNINGS_AS_ERRORS=ON -DTOOLS=ON
 
     - name: Build
       run: |
-- 
cgit v1.2.3