ci: Add SDL_WERROR to a few configurations

This commit is contained in:
Anonymous Maarten 2022-10-06 05:27:37 +02:00 committed by Anonymous Maarten
parent eb8eb621b1
commit 151c23415e
5 changed files with 9 additions and 3 deletions

View File

@ -34,6 +34,7 @@ jobs:
run: | run: |
cmake -B build \ cmake -B build \
-DCMAKE_TOOLCHAIN_FILE=${{ steps.setup_ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE=${{ steps.setup_ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
-DSDL_WERROR=ON \
-DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \ -DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \
-DANDROID_ABI=${{ matrix.platform.android_abi }} \ -DANDROID_ABI=${{ matrix.platform.android_abi }} \
-DSDL_STATIC_PIC=ON \ -DSDL_STATIC_PIC=ON \

View File

@ -13,6 +13,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
run: | run: |
emcmake cmake -S . -B build \ emcmake cmake -S . -B build \
-DSDL_WERROR=ON \
-DSDL_TESTS=ON \ -DSDL_TESTS=ON \
-DSDL_INSTALL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \

View File

@ -70,6 +70,7 @@ jobs:
run: | run: |
cmake -S . -B build -G Ninja \ cmake -S . -B build -G Ninja \
-DSDL_TESTS=ON \ -DSDL_TESTS=ON \
-DSDL_WERROR=ON \
-DSDL_INSTALL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \
-DCMAKE_INSTALL_PREFIX=cmake_prefix \ -DCMAKE_INSTALL_PREFIX=cmake_prefix \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@ -101,6 +102,7 @@ jobs:
( (
cd build-autotools cd build-autotools
${{ github.workspace }}/configure \ ${{ github.workspace }}/configure \
--enable-werror \
--prefix=${{ github.workspace }}/autotools_prefix \ --prefix=${{ github.workspace }}/autotools_prefix \
) )
if test "${{ runner.os }}" != "macOS" ; then if test "${{ runner.os }}" != "macOS" ; then
@ -110,6 +112,7 @@ jobs:
mkdir -p build-autotools/test mkdir -p build-autotools/test
cd build-autotools/test cd build-autotools/test
${{ github.workspace }}/test/configure \ ${{ github.workspace }}/test/configure \
--enable-werror \
--x-includes=/usr/include \ --x-includes=/usr/include \
--x-libraries="/usr/lib/${multiarch}" \ --x-libraries="/usr/lib/${multiarch}" \
--prefix=${{ github.workspace }}/autotools_prefix \ --prefix=${{ github.workspace }}/autotools_prefix \

View File

@ -19,7 +19,7 @@ jobs:
- { name: Windows (clang-cl x86), flags: -T ClangCL -A Win32 } - { name: Windows (clang-cl x86), flags: -T ClangCL -A Win32 }
- { name: Windows (ARM), flags: -A ARM } - { name: Windows (ARM), flags: -A ARM }
- { name: Windows (ARM64), flags: -A ARM64 } - { name: Windows (ARM64), flags: -A ARM64 }
- { name: UWP (x64), flags: -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DSDL_TESTS=OFF, - { name: UWP (x64), flags: -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DSDL_TESTS=OFF, nowerror: true,
project: VisualC-WinRT/SDL-UWP.sln, projectflags: '/p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0.17763.0' } project: VisualC-WinRT/SDL-UWP.sln, projectflags: '/p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0.17763.0' }
steps: steps:
@ -40,6 +40,7 @@ jobs:
""")) """))
- name: Configure (CMake) - name: Configure (CMake)
run: cmake -S build -B build ` run: cmake -S build -B build `
-DSDL_WERROR=${{ !matrix.platform.nowerror }} `
-DSDL_TESTS=ON ` -DSDL_TESTS=ON `
-DSDL_INSTALL_TESTS=ON ` -DSDL_INSTALL_TESTS=ON `
-DSDL2_DISABLE_INSTALL=OFF ` -DSDL2_DISABLE_INSTALL=OFF `

View File

@ -18,10 +18,10 @@ jobs:
- uses: open-watcom/setup-watcom@v0 - uses: open-watcom/setup-watcom@v0
- name: Build SDL2 - name: Build SDL2
run: | run: |
wmake -f ${{ matrix.platform.makefile }} wmake -f ${{ matrix.platform.makefile }} ENABLE_WERROR=1
- name: Build tests - name: Build tests
run: | run: |
cd test && wmake -f ${{ matrix.platform.makefile }} cd test && wmake -f ${{ matrix.platform.makefile }} ENABLE_WERROR=1
cd .. cd ..
- name: Run tests - name: Run tests
if: "matrix.platform.makefile == 'Makefile.w32'" if: "matrix.platform.makefile == 'Makefile.w32'"