revert to gcc build + install g++-14

vizzuhq · Sep 3, 2024 · c12f7ad · c12f7ad
1 parent d460de3
commit c12f7ad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/.clang-format b/.clang-format
@@ -49,7 +49,7 @@ IndentExternBlock: NoIndent
 KeepEmptyLinesAtTheStartOfBlocks: true
 SpacesInContainerLiterals: false
 SpaceAfterTemplateKeyword: true
-AllowShortLambdasOnASingleLine: None
+AllowShortLambdasOnASingleLine: Empty
 AlignAfterOpenBracket: DontAlign
 
 IncludeCategories:

diff --git a/test/qtest/chart.cpp b/test/qtest/chart.cpp
@@ -158,9 +158,7 @@ void TestChart::run()
 				                   row->get_value("Cat2"))
 				                   == std::string_view{"b"};
 			        },
-			        +[](bool(const Vizzu::Data::RowWrapper *))
-			        {
-			        }}};
+			        +[](bool(const Vizzu::Data::RowWrapper *)) {}}};
 			options.title = "VIZZU Chart - Phase 1b";
 			styles.legend.marker.type =
 			    Vizzu::Styles::Legend::Marker::Type::circle;

diff --git a/test/unit/util/to_string.h b/test/unit/util/to_string.h
@@ -30,11 +30,7 @@ std::string to_debug_string(const from &value)
 		return std::string(value);
 	}
 	else if constexpr (requires {
-		                   std::visit(
-		                       [](const auto &)
-		                       {
-		                       },
-		                       value);
+		                   std::visit([](const auto &) {}, value);
 	                   }) {
 		return std::visit(
 		    [](const auto &v)

diff --git a/tools/ci/docker/vizzu-dev-desktop b/tools/ci/docker/vizzu-dev-desktop
@@ -9,10 +9,12 @@ RUN apt-get install -y git wget gnupg software-properties-common
 RUN add-apt-repository ppa:deadsnakes/ppa -y \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && apt-get update \
-    && apt-get install -y clang-18 clang-tools-18 lldb-18 lld-18 clang-tidy-18 clang-format-18 cppcheck cmake \
+    && apt-get install -y gcc-14 g++-14 clang-18 clang-tools-18 lldb-18 lld-18 clang-tidy-18 clang-format-18 cppcheck cmake \
     && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 120 \
     && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 120 \
     && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-18 120 \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 120 \
+    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 120 \
     && ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy \
     && ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
 

diff --git a/tools/ci/run/pkg-build-desktop-clangformat.sh b/tools/ci/run/pkg-build-desktop-clangformat.sh
@@ -9,16 +9,16 @@ JOBS="$1"
 if [ -z "$1" ]; then
     JOBS=$DEFAULT_JOBS
 fi
-export CC=/usr/bin/clang
-export CXX=/usr/bin/clang++
-mkdir -p build/cmake-desktop-clang
-pushd build/cmake-desktop-clang
+export CC=/usr/bin/gcc
+export CXX=/usr/bin/g++
+mkdir -p build/cmake-desktop-gcc
+pushd build/cmake-desktop-gcc
 cmake -Dclangformat:BOOL="ON" ../../project/cmake/
 cmake --build . -- --jobs=$JOBS
 popd
 
 # test desktop
 
-pushd build/cmake-desktop-clang/test
+pushd build/cmake-desktop-gcc/test
 ./vizzutest
 popd