Use fork of fmt to workaround compiler bugs until new fmt release

volt-software · Oct 28, 2024 · 0407a97 · 0407a97
1 parent 1d340a0
commit 0407a97
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -14,6 +14,7 @@ concurrency:
 jobs:
   build:
     runs-on: self-hosted
+    timeout-minutes: 120
 
     strategy:
       matrix:

diff --git a/.gitmodules b/.gitmodules
@@ -7,7 +7,7 @@
 	branch = devel
 [submodule "external/fmt"]
 	path = external/fmt
-	url = https://github.com/fmtlib/fmt.git
+	url = https://github.com/Oipo/fmt.git
 [submodule "external/mimalloc"]
 	path = external/mimalloc
 	url = https://github.com/volt-software/mimalloc-static.git

diff --git a/external/fmt b/external/fmt
diff --git a/quickbuild.sh b/quickbuild.sh
@@ -18,9 +18,10 @@ BUILDTYPE="Debug"
 RUN_EXAMPLES=0
 IODEBUG=0
 DEBUG=0
-CCOMP=clang-20
-CXXCOMP=clang++-20
+CCOMP=clang-19
+CXXCOMP=clang++-19
 BOOST=0
+SPDLOG=0
 
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -67,10 +68,14 @@ while [[ $# -gt 0 ]]; do
       RUN_EXAMPLES=1
       shift # past value
       ;;
-    --with-boost)
+    --boost)
       BOOST=1
       shift # past value
       ;;
+    --spdlog)
+      SPDLOG=1
+      shift # past value
+      ;;
     -*|--*)
       echo "Unknown option $1"
       exit 1
@@ -87,7 +92,7 @@ set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
 rm -rf ./*
 rm -rf ../bin/*
 
-CC=${CCOMP} CXX=${CXXCOMP} cmake -DCMAKE_BUILD_TYPE=${BUILDTYPE} -DICHOR_REMOVE_SOURCE_NAMES=0 -DICHOR_ENABLE_INTERNAL_DEBUGGING=${DEBUG} -DICHOR_ENABLE_INTERNAL_IO_DEBUGGING=${IODEBUG} -DICHOR_ARCH_OPTIMIZATION=X86_64_AVX2 -DICHOR_USE_BACKWARD=0 -DICHOR_USE_BOOST_BEAST=${BOOST} -DICHOR_USE_HIREDIS=1 -DICHOR_USE_LIBCPP=0 -DICHOR_USE_SANITIZERS=${ASAN} -DICHOR_USE_THREAD_SANITIZER=${TSAN} -DICHOR_USE_MOLD=1 -DICHOR_USE_SDEVENT=1 -DICHOR_USE_SPDLOG=0 -GNinja .. || exit 1
+CC=${CCOMP} CXX=${CXXCOMP} cmake -DCMAKE_BUILD_TYPE=${BUILDTYPE} -DICHOR_REMOVE_SOURCE_NAMES=0 -DICHOR_ENABLE_INTERNAL_DEBUGGING=${DEBUG} -DICHOR_ENABLE_INTERNAL_IO_DEBUGGING=${IODEBUG} -DICHOR_ARCH_OPTIMIZATION=X86_64_AVX2 -DICHOR_USE_BACKWARD=0 -DICHOR_USE_BOOST_BEAST=${BOOST} -DICHOR_USE_HIREDIS=1 -DICHOR_USE_LIBCPP=0 -DICHOR_USE_SANITIZERS=${ASAN} -DICHOR_USE_THREAD_SANITIZER=${TSAN} -DICHOR_USE_MOLD=1 -DICHOR_USE_SDEVENT=1 -DICHOR_USE_SPDLOG=${SPDLOG} -GNinja .. || exit 1
 
 ninja || exit 1
 ninja test || exit 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ concurrency: @@
     jobs:
       build:
         runs-on: self-hosted
+        timeout-minutes: 120
         strategy:
           matrix:
@@ Expand Down @@