diff options
| -rw-r--r-- | .circleci/config.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/gcc-build.yml | 25 | ||||
| -rw-r--r-- | .github/workflows/macos-arm-build.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/win-x64-build.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 6 |
5 files changed, 39 insertions, 21 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b36ba9453f..a913237a772 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,14 +56,14 @@ jobs: - run: name: Setup command: | - mkdir bin - cd bin + export CFLAGS="-Werror" + export CXXFLAGS="-Werror" if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 + export CMAKE_BUILD_TYPE=Release else - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 + export CMAKE_BUILD_TYPE=Debug fi - cd .. + cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 - run: name: Build command: | @@ -128,6 +128,9 @@ jobs: export CCACHE_MAXSIZE="1G" export CC="ccache clang" export CXX="ccache clang++" + export CFLAGS="-Werror" + export CXXFLAGS="-Werror" + export CMAKE_BUILD_TYPE=Debug export CCACHE_CPP2=yes export USE_CCACHE=1 export PATH=/usr/lib/ccache:$PATH @@ -136,10 +139,7 @@ jobs: ccache -s git config user.email "circleci@build.bot" && git config user.name "Circle CI" $CXX --version - mkdir bin - cd bin - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install - cd .. + cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install - run: name: Build command: | diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml index 4f7b5818def..2d51498a0dd 100644 --- a/.github/workflows/gcc-build.yml +++ b/.github/workflows/gcc-build.yml @@ -8,17 +8,26 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - name: Set reusable strings + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/bin" >> "$GITHUB_OUTPUT" - name: Dependencies run: | sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-11 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 - name: Setup - run: | - mkdir bin - cd bin - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1 - cd .. + 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 + -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" + -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1 - name: Build run: | cd bin @@ -29,6 +38,6 @@ jobs: make test - name: Check executables run: | - cd bin/check_install/bin + cd ${{ github.workspace }}/check_install/bin ./bnetserver --version - ./worldserver --version
\ No newline at end of file + ./worldserver --version diff --git a/.github/workflows/macos-arm-build.yml b/.github/workflows/macos-arm-build.yml index 3c890bd4dfb..fb353fd5ba3 100644 --- a/.github/workflows/macos-arm-build.yml +++ b/.github/workflows/macos-arm-build.yml @@ -36,9 +36,14 @@ jobs: echo "Cores: $(nproc), Arch: $(uname -p)" - 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 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DBUILD_TESTING=1 + -DWITH_WARNINGS=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 3c849e31f93..2a1f03c7c28 100644 --- a/.github/workflows/win-x64-build.yml +++ b/.github/workflows/win-x64-build.yml @@ -46,11 +46,13 @@ jobs: - name: Configure CMake env: + CFLAGS: /WX CXXFLAGS: /WX BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} + CMAKE_BUILD_TYPE: RelWithDebInfo run: > cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }} - -DTOOLS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DTOOLS=ON - name: Build run: | diff --git a/appveyor.yml b/appveyor.yml index 500b45b80b6..5f013678907 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,13 +7,15 @@ environment: BOOST_ROOT: C:\Libraries\boost_1_83_0 MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0 OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64 + CFLAGS: /WX + CXXFLAGS: /WX build_script: - cmd: >- git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" - md build && cd build + cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DTOOLS=ON - cmake -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DTOOLS=True -DCMAKE_CXX_FLAGS=" /DWIN32 /D_WINDOWS /W3 /GR /EHsc /WX" -DCMAKE_C_FLAGS="/DWIN32 /D_WINDOWS /W3 /WX" .. + cd build "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" /nologo /m:2 /p:Configuration=RelWithDebInfo /p:Platform="X64" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "TrinityCore.sln" |