From e9c53985bda80e41a9252c96c4f039f76105489b Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 31 Aug 2024 16:36:58 +0200 Subject: [PATCH] ci: build in RelWithDebInfo mode --- .github/workflows/android.yml | 8 ++++---- .github/workflows/main.yml | 8 ++++---- .github/workflows/msvc.yml | 10 +++++----- .github/workflows/n3ds.yml | 6 +++--- .github/workflows/ps2.yaml | 8 ++++---- .github/workflows/psp.yaml | 8 ++++---- .github/workflows/riscos.yml | 4 ++-- .github/workflows/vita.yaml | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a2d2b0b50592b..4aa1911f3f7cf 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -40,16 +40,16 @@ jobs: -DSDL_STATIC_PIC=ON \ -DSDL_VENDOR_INFO="Github Workflow" \ -DCMAKE_INSTALL_PREFIX=prefix \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -GNinja - name: Build (CMake) if: ${{ matrix.platform.name == 'CMake' }} run: | - cmake --build build --config Release --parallel --verbose + cmake --build build --config RelWithDebInfo --parallel --verbose - name: Install (CMake) if: ${{ matrix.platform.name == 'CMake' }} run: | - cmake --install build --config Release + cmake --install build --config RelWithDebInfo echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV ( cd prefix; find ) | LC_ALL=C sort -u - name: Verify CMake configuration files @@ -59,7 +59,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${{ steps.setup_ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \ -DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \ -DANDROID_ABI=${{ matrix.platform.android_abi }} \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} cmake --build cmake_config_build --verbose - name: Verify sdl2-config diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89633eeb8ecdd..572cecdc0af51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -101,13 +101,13 @@ jobs: -DSDL_INSTALL_TESTS=ON \ -DSDL_VENDOR_INFO="Github Workflow" \ -DCMAKE_INSTALL_PREFIX=cmake_prefix \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ${{ matrix.platform.cmake }} - name: Build (CMake) if: "! matrix.platform.autotools" run: | ${{ matrix.platform.source_cmd }} - cmake --build build/ --config Release --verbose --parallel + cmake --build build/ --config RelWithDebInfo --verbose --parallel - name: Run build-time tests (CMake) if: ${{ ! matrix.platform.autotools && !matrix.platform.cross }} run: | @@ -123,7 +123,7 @@ jobs: if: "! matrix.platform.autotools" run: | set -eu - cmake --install build/ --config Release + cmake --install build/ --config RelWithDebInfo echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV ( cd cmake_prefix; find ) | LC_ALL=C sort -u - name: Configure (Autotools) @@ -198,7 +198,7 @@ jobs: run: | ${{ matrix.platform.source_cmd }} cmake -S cmake/test -B cmake_config_build -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ${{ matrix.platform.cmake }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} cmake --build cmake_config_build --verbose diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index c5034d2f94582..8a6fc1029fb02 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -62,7 +62,7 @@ jobs: id: cmake-configure if: ${{ !matrix.platform.no-cmake }} run: cmake -S build -B build -GNinja ` - -DCMAKE_BUILD_TYPE=Release ` + -DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DSDL_WERROR=ON ` -DSDL_TESTS=ON ` -DCMAKE_C_FLAGS="${{ matrix.platform.cppflags }}" ` @@ -80,13 +80,13 @@ jobs: id: cmake-build if: ${{ steps.cmake-configure.outcome == 'success' }} run: | - cmake --build build/ --config Release --verbose --parallel -- -k0 + cmake --build build/ --config RelWithDebInfo --verbose --parallel -- -k0 - name: Run build-time tests id: cmake-test if: ${{ steps.cmake-build.outcome == 'success' && !contains(matrix.platform.name, 'ARM') && !contains(matrix.platform.name, 'UWP') }} run: | $env:SDL_TESTS_QUICK=1 - ctest -VV --test-dir build/ -C Release -j2 + ctest -VV --test-dir build/ -C RelWithDebInfo -j2 - name: Install (CMake) id: cmake-install if: ${{ steps.cmake-build.outcome == 'success' }} @@ -97,7 +97,7 @@ jobs: if: ${{ steps.cmake-install.outcome == 'success' && !contains(matrix.platform.name, 'UWP') }} run: | cmake -S cmake/test -B cmake_config_build -GNinja ` - -DCMAKE_BUILD_TYPE=Release ` + -DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} ` -DCMAKE_C_FLAGS="${{ matrix.platform.cppflags }}" ` -DCMAKE_CXX_FLAGS="${{ matrix.platform.cppflags }}" ` @@ -105,7 +105,7 @@ jobs: -DCMAKE_SHARED_LINKER_FLAGS="${{ matrix.platform.ldflags }}" ` -DCMAKE_STATIC_LINKER_FLAGS="${{ matrix.platform.ldflags }}" ` ${{ matrix.platform.cmake-args }} - cmake --build cmake_config_build --config Release + cmake --build cmake_config_build --config RelWithDebInfo - name: Add msbuild to PATH if: ${{ matrix.platform.project != '' }} uses: microsoft/setup-msbuild@v2 diff --git a/.github/workflows/n3ds.yml b/.github/workflows/n3ds.yml index c7a135a070bb3..dff6f50edd44d 100644 --- a/.github/workflows/n3ds.yml +++ b/.github/workflows/n3ds.yml @@ -21,7 +21,7 @@ jobs: -DSDL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \ -DSDL_VENDOR_INFO="Github Workflow" \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=prefix - name: Build run: cmake --build build --verbose @@ -36,13 +36,13 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake \ -DTEST_SHARED=FALSE \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build cmake_config_build --verbose - name: Extract CC/CXX/CFLAGS/CXXFLAGS from CMake toolchain run: | cmake -S .github/cmake -B /tmp/cmake_extract \ -DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DVAR_PATH=/tmp/n3ds_env.txt cat /tmp/n3ds_env.txt >> $GITHUB_ENV - name: Verify sdl2-config diff --git a/.github/workflows/ps2.yaml b/.github/workflows/ps2.yaml index 2fb97f27b8e8c..5235a09d1c4a6 100644 --- a/.github/workflows/ps2.yaml +++ b/.github/workflows/ps2.yaml @@ -29,13 +29,13 @@ jobs: -DSDL_WERROR=ON \ -DSDL_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=cmake_prefix \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=RelWithDebInfo - name: Build - run: cmake --build build --config Release --verbose --parallel + run: cmake --build build --config RelWithDebInfo --verbose --parallel - name: Install (CMake) run: | set -eu - cmake --install build/ --config Release + cmake --install build/ --config RelWithDebInfo echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV ( cd cmake_prefix; find ) | LC_ALL=C sort -u @@ -45,7 +45,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=$PS2DEV/ps2sdk/ps2dev.cmake \ -DTEST_SHARED=FALSE \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build cmake_config_build --verbose - name: Verify sdl2-config run: | diff --git a/.github/workflows/psp.yaml b/.github/workflows/psp.yaml index 83e5dc31c7af7..e700779c87d17 100644 --- a/.github/workflows/psp.yaml +++ b/.github/workflows/psp.yaml @@ -19,14 +19,14 @@ jobs: -DSDL_WERROR=ON \ -DSDL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=prefix - name: Build - run: cmake --build build --config Release + run: cmake --build build --config RelWithDebInfo - name: Install run: | echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV - cmake --install build --config Release + cmake --install build --config RelWithDebInfo ( cd prefix; find ) | LC_ALL=C sort -u - name: Verify CMake configuration files run: | @@ -34,7 +34,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DTEST_SHARED=FALSE \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build cmake_config_build --verbose - name: Verify sdl2-config run: | diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml index 9f4c1402803a8..c5031e01a43d0 100644 --- a/.github/workflows/riscos.yml +++ b/.github/workflows/riscos.yml @@ -47,7 +47,7 @@ jobs: -DSDL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \ -DSDL_VENDOR_INFO="Github Workflow" \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/prefix_cmake - name: Build (CMake) if: ${{ contains(matrix.platform.name, 'CMake') }} @@ -63,6 +63,6 @@ jobs: cmake -S cmake/test -B cmake_config_build -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ${{ matrix.platform.test_args }} cmake --build cmake_config_build --verbose diff --git a/.github/workflows/vita.yaml b/.github/workflows/vita.yaml index 80894082312c3..849558a239c2f 100644 --- a/.github/workflows/vita.yaml +++ b/.github/workflows/vita.yaml @@ -66,7 +66,7 @@ jobs: -DSDL_WERROR=ON \ -DSDL_TESTS=ON \ -DSDL_INSTALL_TESTS=ON \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=prefix - name: Build run: cmake --build build --verbose @@ -81,7 +81,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \ -DTEST_SHARED=FALSE \ -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build cmake_config_build --verbose - name: Verify sdl2-config run: |