Skip to content

Commit d6b32de

Browse files
committed
Disable flatbuffers option in CMake configuration
Flatbuffers support is disabled because serialization for C++ modules is not fully implemented yet. This should speed up a the CI until we need to re-enable it. Signed-off-by: Roberto Raggi <[email protected]>
1 parent 30d1e05 commit d6b32de

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ jobs:
2222
run: |
2323
. .venv/bin/activate
2424
25-
cmake . \
26-
-Bbuild \
27-
-DCMAKE_BUILD_TYPE=Release
25+
cmake . -Bbuild -DCMAKE_BUILD_TYPE=Release
2826
29-
cmake --build build
27+
cmake --build build --parallel
3028
3129
- name: Test
3230
working-directory: build
@@ -40,11 +38,10 @@ jobs:
4038
./build/src/frontend/cxx \
4139
-I src/parser \
4240
-I src/lsp \
43-
-I build/_deps/fmt-src/include \
4441
-I build/_deps/utfcpp-src/source \
45-
-I build/_deps/flatbuffers-src/include \
4642
-I build/_deps/nlohmann_json-src/include \
4743
-I build/src/parser \
44+
-DCXX_NO_FLATBUFFERS \
4845
-DCXX_NO_FILESYSTEM \
4946
-DCXX_NO_THREADS \
5047
$i
@@ -58,11 +55,10 @@ jobs:
5855
-toolchain linux \
5956
-I src/parser \
6057
-I src/lsp \
61-
-I build/_deps/fmt-src/include \
6258
-I build/_deps/utfcpp-src/source \
63-
-I build/_deps/flatbuffers-src/include \
6459
-I build/_deps/nlohmann_json-src/include \
6560
-I build/src/parser \
61+
-DCXX_NO_FLATBUFFERS \
6662
$i
6763
done
6864
@@ -95,7 +91,7 @@ jobs:
9591
-DCXX_ENABLE_MLIR=ON \
9692
-DMLIR_DIR=/usr/lib/llvm-18/lib/cmake/mlir
9793
98-
cmake --build build
94+
cmake --build build --parallel
9995
10096
- name: Test
10197
working-directory: build
@@ -119,7 +115,7 @@ jobs:
119115
120116
cmake . -Bbuild
121117
122-
cmake --build build --config Release
118+
cmake --build build --parallel --config Release
123119
124120
- name: Test
125121
working-directory: build
@@ -193,7 +189,7 @@ jobs:
193189
-Bbuild \
194190
-DCMAKE_BUILD_TYPE=Release
195191
196-
cmake --build build
192+
cmake --build build --parallel
197193
198194
- name: Test
199195
working-directory: build
@@ -208,11 +204,10 @@ jobs:
208204
-toolchain macos \
209205
-I src/parser \
210206
-I src/lsp \
211-
-I build/_deps/fmt-src/include \
212207
-I build/_deps/utfcpp-src/source \
213-
-I build/_deps/flatbuffers-src/include \
214208
-I build/_deps/nlohmann_json-src/include \
215209
-I build/src/parser \
210+
-DCXX_NO_FLATBUFFERS \
216211
$i
217212
done
218213
@@ -259,11 +254,10 @@ jobs:
259254
build.wasi/install/usr/bin/cxx.wasm \
260255
-I src/parser \
261256
-I src/lsp \
262-
-I build.wasi/_deps/fmt-src/include \
263257
-I build.wasi/_deps/utfcpp-src/source \
264-
-I build.wasi/_deps/flatbuffers-src/include \
265258
-I build.wasi/_deps/nlohmann_json-src/include \
266259
-I build.wasi/src/parser \
260+
-DCXX_NO_FLATBUFFERS \
267261
-DCXX_NO_FILESYSTEM \
268262
-DCXX_NO_THREADS \
269263
$i

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ file(READ "${CMAKE_CURRENT_SOURCE_DIR}/package.json" package_json)
3939
# option to install tools
4040
option(CXX_INSTALL_TOOLS "Install tools" ON)
4141
option(CXX_INSTALL_WASI_SYSROOT "Install wasi sysroot" OFF)
42-
option(CXX_ENABLE_FLATBUFFERS "Enable flatbuffers" ON)
42+
option(CXX_ENABLE_FLATBUFFERS "Enable flatbuffers" OFF)
4343
option(CXX_ENABLE_MLIR "Enable MLIR" OFF)
4444
option(CXX_LIBCXX_WITH_CLANG "Link with libc++" OFF)
4545
option(CXX_BUILD_TESTS "Build tests" ON)

0 commit comments

Comments
 (0)