From 08ae4e7a746d65ff77a2a950156e669955037b9d Mon Sep 17 00:00:00 2001 From: Mario Liebisch Date: Fri, 7 Jun 2024 20:46:35 +0200 Subject: [PATCH] Renamed CI/CD CMake preset and made it visible again --- .github/workflows/ci.yml | 6 +++--- CMakePresets.json | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a7094bd9..48a5e1a10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -211,7 +211,7 @@ jobs: ccache --version - name: Configure CMake - run: cmake --preset dev -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} ${{matrix.config.flags}} ${{matrix.type.flags}} + run: cmake --preset ci-cd -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} ${{matrix.config.flags}} ${{matrix.type.flags}} - name: Build run: cmake --build build --config ${{ matrix.type.name == 'Debug' && 'Debug' || 'Release' }} --target install @@ -377,7 +377,7 @@ jobs: echo /usr/local/opt/llvm/bin >> $GITHUB_PATH - name: Configure - run: cmake --preset dev -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_UNITY_BUILD=ON ${{matrix.platform.flags}} + run: cmake --preset ci-cd -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_UNITY_BUILD=ON ${{matrix.platform.flags}} - name: Analyze Code run: cmake --build build --target tidy @@ -409,7 +409,7 @@ jobs: run: sudo apt-get update && sudo apt-get install xorg-dev libxrandr-dev libxcursor-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb fluxbox && sudo apt-get remove -y libasound2 - name: Configure - run: cmake --preset dev -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DSFML_BUILD_EXAMPLES=OFF -DSFML_ENABLE_SANITIZERS=ON ${{matrix.platform.flags}} + run: cmake --preset ci-cd -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DSFML_BUILD_EXAMPLES=OFF -DSFML_ENABLE_SANITIZERS=ON ${{matrix.platform.flags}} - name: Build run: cmake --build build diff --git a/CMakePresets.json b/CMakePresets.json index 352e95b42..c6358fc4f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -14,9 +14,8 @@ } }, { - "name": "dev", - "displayName": "Development (used by CI/CD)", - "hidden": true, + "name": "ci-cd", + "displayName": "CI/CD Preset", "binaryDir": "build", "installDir": "${sourceDir}/build/install", "inherits": "generic"