Skip to content

Commit 17f97b2

Browse files
committed
fix
1 parent 519ded8 commit 17f97b2

File tree

4 files changed

+60
-56
lines changed

4 files changed

+60
-56
lines changed

.devcontainer/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
mkdir -p build
44
git submodule update --init --recursive
55
ccache -o cache_dir=/root/.ccache
6-
cmake --preset release-test-with-ccache-basedir -DCMAKE_EXPORT_COMPILE_COMMANDS=1
6+
cmake --preset release-test-clang
77

88
if which ydb > /dev/null 2>&1; then
99
ENDPOINT=$(echo ${YDB_CONNECTION_STRING_SECURE:-$YDB_CONNECTION_STRING} | awk -F/ '{print $3}')

.github/actions/build/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
run: |
1616
mkdir -p build
1717
rm -rf build/*
18-
cmake --preset release-test-with-ccache-basedir-${{ inputs.compiler }}
18+
cmake --preset release-test-${{ inputs.compiler }}
1919
- name: Build
2020
shell: bash
2121
run: |

.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
59+
ctest -j32 --preset release-unit-${{ matrix.compiler }}
6060
6161
integration:
6262
concurrency:
@@ -116,4 +116,4 @@ jobs:
116116
- name: Test
117117
shell: bash
118118
run: |
119-
ctest -j32 --preset release-integration
119+
ctest -j32 --preset release-integration-${{ matrix.compiler }}

CMakePresets.json

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@
4949
"CMAKE_C_COMPILER": "gcc"
5050
}
5151
},
52+
{
53+
"name": "test",
54+
"hidden": true,
55+
"cacheVariables": {
56+
"YDB_SDK_TESTS": "TRUE",
57+
"YDB_SDK_EXAMPLES": "TRUE",
58+
"ARCADIA_ROOT": "../ydb-cpp-sdk",
59+
"ARCADIA_BUILD_ROOT": "."
60+
}
61+
},
5262
{
5363
"name": "release-clang",
5464
"inherits": [
@@ -69,43 +79,15 @@
6979
},
7080
{
7181
"name": "release-test-clang",
72-
"inherits": "release-clang",
82+
"inherits": ["release-clang", "test"],
7383
"displayName": "Default Release Test Config (Clang)",
74-
"description": "Default release build configuration with all tests and examples",
75-
"cacheVariables": {
76-
"YDB_SDK_TESTS": "TRUE",
77-
"YDB_SDK_EXAMPLES": "TRUE"
78-
}
84+
"description": "Default release build configuration with all tests and examples"
7985
},
8086
{
8187
"name": "release-test-gcc",
82-
"inherits": "release-gcc",
88+
"inherits": ["release-gcc", "test"],
8389
"displayName": "Default Release Test Config (GCC)",
84-
"description": "Default release build configuration with all tests and examples using GCC",
85-
"cacheVariables": {
86-
"YDB_SDK_TESTS": "TRUE",
87-
"YDB_SDK_EXAMPLES": "TRUE"
88-
}
89-
},
90-
{
91-
"name": "release-test-with-ccache-basedir-clang",
92-
"inherits": "release-test-clang",
93-
"displayName": "Release Test Config CCACHE_BASEDIR Case (Clang)",
94-
"description": "Only for the case when using CCACHE_BASEDIR with Clang",
95-
"cacheVariables": {
96-
"ARCADIA_ROOT": "../ydb-cpp-sdk",
97-
"ARCADIA_BUILD_ROOT": "."
98-
}
99-
},
100-
{
101-
"name": "release-test-with-ccache-basedir-gcc",
102-
"inherits": "release-test-gcc",
103-
"displayName": "Release Test Config CCACHE_BASEDIR Case (GCC)",
104-
"description": "Only for the case when using CCACHE_BASEDIR with GCC",
105-
"cacheVariables": {
106-
"ARCADIA_ROOT": "../ydb-cpp-sdk",
107-
"ARCADIA_BUILD_ROOT": "."
108-
}
90+
"description": "Default release build configuration with all tests and examples using GCC"
10991
}
11092
],
11193
"buildPresets": [
@@ -132,32 +114,18 @@
132114
}
133115
},
134116
{
135-
"name": "release",
136-
"inherits": "common",
137-
"configurePreset": "release-base",
138-
"displayName": "Default Release Tests",
139-
"environment": {
140-
"YDB_ENDPOINT": "localhost:2136",
141-
"YDB_DATABASE": "/local"
142-
}
143-
},
144-
{
145-
"name": "release-unit",
146-
"inherits": "common",
147-
"configurePreset": "release-base",
148-
"displayName": "Default Unit Release Tests",
149-
"filter" : {
117+
"name": "unit",
118+
"hidden": true,
119+
"filter": {
150120
"include": {
151121
"label": "unit"
152122
}
153123
}
154124
},
155125
{
156-
"name": "release-integration",
157-
"inherits": "common",
158-
"configurePreset": "release-base",
159-
"displayName": "Default Integration Release Tests",
160-
"filter" : {
126+
"name": "integration",
127+
"hidden": true,
128+
"filter": {
161129
"include": {
162130
"label": "integration"
163131
}
@@ -166,6 +134,42 @@
166134
"YDB_ENDPOINT": "localhost:2136",
167135
"YDB_DATABASE": "/local"
168136
}
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)"
169173
}
170174
]
171175
}

0 commit comments

Comments
 (0)