build: add "ci" configure preset to reduce verbosity

`cmake --preset ci`

is equivalent to

`cmake -B build -G Ninja -D CI_BUILD=ON`

Also remove build presets as they're not very useful without workflow
presets, which are only available in schema versions 6 and above.
This commit is contained in:
dundargoc 2023-04-23 17:12:46 +02:00 committed by GitHub
parent 943ac2be55
commit 664f2749e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 54 deletions

View File

@ -199,7 +199,7 @@ jobs:
- name: Build - name: Build
run: | run: |
cmake -B build -G Ninja -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX ${{ matrix.flags }} -D CI_BUILD=ON cmake --preset ci -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX ${{ matrix.flags }}
cmake --build build cmake --build build
- if: "!cancelled()" - if: "!cancelled()"
@ -305,7 +305,7 @@ jobs:
- name: Build - name: Build
run: | run: |
cmake -B build -G Ninja -D CMAKE_BUILD_TYPE='RelWithDebInfo' -D CI_BUILD=ON cmake --preset ci -D CMAKE_BUILD_TYPE='RelWithDebInfo'
cmake --build build cmake --build build
- name: Install test deps - name: Install test deps
@ -395,5 +395,5 @@ jobs:
- name: Build - name: Build
run: | run: |
cmake -B build -G Ninja -D CI_BUILD=ON cmake --preset ci
cmake --build build cmake --build build

View File

@ -34,65 +34,21 @@
}, },
"inherits": ["base"] "inherits": ["base"]
}, },
{
"name": "windows-default",
"displayName": "Windows x64 RelWithDebInfo",
"description": "Sets Ninja generator, enables optimizations with debug information for x64",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
},
"architecture": {
"value": "x64",
"strategy": "external"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": ["Windows"]
}
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
},
"inherits": ["base"]
},
{ {
"name": "iwyu", "name": "iwyu",
"displayName": "IWYU", "displayName": "IWYU",
"description": "Run include-what-you-use with the compiler", "description": "Run include-what-you-use",
"cacheVariables": { "cacheVariables": {
"ENABLE_IWYU": "ON" "ENABLE_IWYU": "ON"
}, },
"inherits": ["base"] "inherits": ["base"]
}
],
"buildPresets": [
{
"name": "default",
"configurePreset": "default"
}, },
{ {
"name": "debug", "name": "ci",
"configurePreset": "debug" "cacheVariables": {
}, "CI_BUILD": "ON"
{ },
"name": "release", "inherits": ["base"]
"configurePreset": "release"
},
{
"name": "windows-default",
"configurePreset": "windows-default",
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "iwyu",
"configurePreset": "iwyu"
} }
] ]
} }

View File

@ -254,7 +254,7 @@ For managing includes in C files, use [include-what-you-use].
- To see which includes needs fixing use the cmake preset `iwyu`: - To see which includes needs fixing use the cmake preset `iwyu`:
``` ```
cmake --preset iwyu cmake --preset iwyu
cmake --build --preset iwyu cmake --build build iwyu
``` ```
- There's also a make target that automatically fixes the suggestions from - There's also a make target that automatically fixes the suggestions from
IWYU: IWYU: