Skip to content

Commit 349b652

Browse files
committed
Fix
1 parent 17f97b2 commit 349b652

File tree

3 files changed

+25
-69
lines changed

3 files changed

+25
-69
lines changed

.github/actions/build/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ runs:
2222
ccache -z
2323
export CCACHE_BASEDIR=`realpath ..`
2424
export CCACHE_DIR=~/.ccache
25-
cmake --build --preset release-${{ inputs.compiler }} -- -j32
25+
cmake --build --preset default -- -j$(nproc)
2626
ccache -s

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Test
5757
shell: bash
5858
run: |
59-
ctest -j32 --preset release-unit-${{ matrix.compiler }}
59+
ctest -j$(nproc) --preset unit
6060
6161
integration:
6262
concurrency:
@@ -116,4 +116,4 @@ jobs:
116116
- name: Test
117117
shell: bash
118118
run: |
119-
ctest -j32 --preset release-integration-${{ matrix.compiler }}
119+
ctest -j$(nproc) --preset integration

CMakePresets.json

Lines changed: 22 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"configurePresets": [
99
{
1010
"name": "base",
11-
"hidden": true,
11+
"displayName": "Generic Config",
1212
"cacheVariables": {
1313
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
1414
},
@@ -55,51 +55,36 @@
5555
"cacheVariables": {
5656
"YDB_SDK_TESTS": "TRUE",
5757
"YDB_SDK_EXAMPLES": "TRUE",
58-
"ARCADIA_ROOT": "../ydb-cpp-sdk",
58+
"ARCADIA_ROOT": "..",
5959
"ARCADIA_BUILD_ROOT": "."
6060
}
6161
},
6262
{
6363
"name": "release-clang",
64-
"inherits": [
65-
"release-base",
66-
"clang-toolchain"
67-
],
68-
"displayName": "Default Release Config (Clang)",
69-
"description": "Default release build configuration using Ninja generator and Clang compiler"
64+
"inherits": ["release-base", "clang-toolchain"],
65+
"displayName": "Default Release Config (Clang)"
7066
},
7167
{
7268
"name": "release-gcc",
73-
"inherits": [
74-
"release-base",
75-
"gcc-toolchain"
76-
],
77-
"displayName": "Default Release Config (GCC)",
78-
"description": "Default release build configuration using Ninja generator and GCC compiler"
69+
"inherits": ["release-base", "gcc-toolchain"],
70+
"displayName": "Default Release Config (GCC)"
7971
},
8072
{
8173
"name": "release-test-clang",
82-
"inherits": ["release-clang", "test"],
83-
"displayName": "Default Release Test Config (Clang)",
84-
"description": "Default release build configuration with all tests and examples"
74+
"inherits": ["release-base", "clang-toolchain", "test"],
75+
"displayName": "Default Release Test Config (Clang)"
8576
},
8677
{
8778
"name": "release-test-gcc",
88-
"inherits": ["release-gcc", "test"],
89-
"displayName": "Default Release Test Config (GCC)",
90-
"description": "Default release build configuration with all tests and examples using GCC"
79+
"inherits": ["release-base", "gcc-toolchain", "test"],
80+
"displayName": "Default Release Test Config (GCC)"
9181
}
9282
],
9383
"buildPresets": [
9484
{
95-
"name": "release-clang",
96-
"configurePreset": "release-clang",
97-
"displayName": "Default Release Build (Clang)"
98-
},
99-
{
100-
"name": "release-gcc",
101-
"configurePreset": "release-gcc",
102-
"displayName": "Default Release Build (GCC)"
85+
"name": "default",
86+
"displayName": "Default Build",
87+
"configurePreset": "base"
10388
}
10489
],
10590
"testPresets": [
@@ -113,9 +98,15 @@
11398
"timeout": 1200
11499
}
115100
},
101+
{
102+
"name": "all",
103+
"displayName": "Run All Tests",
104+
"configurePreset": "base"
105+
},
116106
{
117107
"name": "unit",
118-
"hidden": true,
108+
"displayName": "Run Unit Tests",
109+
"configurePreset": "base",
119110
"filter": {
120111
"include": {
121112
"label": "unit"
@@ -124,7 +115,8 @@
124115
},
125116
{
126117
"name": "integration",
127-
"hidden": true,
118+
"displayName": "Run Integration Tests",
119+
"configurePreset": "base",
128120
"filter": {
129121
"include": {
130122
"label": "integration"
@@ -134,42 +126,6 @@
134126
"YDB_ENDPOINT": "localhost:2136",
135127
"YDB_DATABASE": "/local"
136128
}
137-
},
138-
{
139-
"name": "release-clang",
140-
"inherits": ["common", "unit", "integration"],
141-
"configurePreset": "release-test-clang",
142-
"displayName": "Default Release Tests (Clang)"
143-
},
144-
{
145-
"name": "release-unit-clang",
146-
"inherits": ["common", "unit"],
147-
"configurePreset": "release-test-clang",
148-
"displayName": "Default Unit Release Tests (Clang)"
149-
},
150-
{
151-
"name": "release-integration-clang",
152-
"inherits": ["common", "integration"],
153-
"configurePreset": "release-test-clang",
154-
"displayName": "Default Integration Release Tests (Clang)"
155-
},
156-
{
157-
"name": "release-gcc",
158-
"inherits": ["common", "unit", "integration"],
159-
"configurePreset": "release-gcc",
160-
"displayName": "Default Release Tests (GCC)"
161-
},
162-
{
163-
"name": "release-unit-gcc",
164-
"inherits": ["common", "unit"],
165-
"configurePreset": "release-test-gcc",
166-
"displayName": "Default Unit Release Tests (GCC)"
167-
},
168-
{
169-
"name": "release-integration-gcc",
170-
"inherits": ["common", "integration"],
171-
"configurePreset": "release-test-gcc",
172-
"displayName": "Default Integration Release Tests (GCC)"
173129
}
174130
]
175131
}

0 commit comments

Comments
 (0)