mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed CI/CD CMake preset and made it visible again

Browse Source
This commit is contained in:
Mario Liebisch 2024-06-07 20:46:35 +02:00
parent 291e6248d6
commit 08ae4e7a74
No known key found for this signature in database
GPG Key ID: 32B56AC1F87EFBF9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -211,7 +211,7 @@ jobs:
ccache --version ccache --version
- name: Configure CMake - 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 - name: Build
run: cmake --build build --config ${{ matrix.type.name == 'Debug' && 'Debug' || 'Release' }} --target install 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 echo /usr/local/opt/llvm/bin >> $GITHUB_PATH
- name: Configure - 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 - name: Analyze Code
run: cmake --build build --target tidy 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 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 - 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 - name: Build
run: cmake --build build run: cmake --build build

5
CMakePresets.json
View File

@ -14,9 +14,8 @@
} }
}, },
{ {
"name": "dev", "name": "ci-cd",
"displayName": "Development (used by CI/CD)", "displayName": "CI/CD Preset",
"hidden": true,
"binaryDir": "build", "binaryDir": "build",
"installDir": "${sourceDir}/build/install", "installDir": "${sourceDir}/build/install",
"inherits": "generic" "inherits": "generic"