Merge branch 'main' into fix-2859

.github/workflows/build-docker.yml

@@ -47,14 +47,6 @@ jobs:
         with:
           install: true
 
-      - name: Cache Docker layers
-        uses: actions/cache@main
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-x86-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-x86-
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -109,14 +101,6 @@ jobs:
         with:
           install: true
 
-      - name: Cache Docker layers
-        uses: actions/cache@main
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-arm-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-arm-
-
       - name: Build
         uses: docker/[email protected]
         with:

.github/workflows/build-ubuntu.yml

@@ -36,26 +36,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
         buildtype: [linux-release, linux-debug]
         include:
           - os: ubuntu-22.04
             triplet: x64-linux
+          - os: ubuntu-24.04
+            triplet: x64-linux
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
 
       - name: Install Linux Dependencies
         run: >
-          sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r)
+          sudo apt-get update && sudo apt-get install ccache linux-headers-"$(uname -r)"
+
+      - name: Switch to gcc-12 on Ubuntu 22.04
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          sudo apt install gcc-12 g++-12
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
+          sudo update-alternatives --set gcc /usr/bin/gcc-12
 
-      - name: Switch to gcc-11
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Switch to gcc-14 on Ubuntu 24.04
+        if: matrix.os == 'ubuntu-24.04'
         run: |
-          sudo apt install gcc-11 g++-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
-          sudo update-alternatives --set gcc /usr/bin/gcc-11
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          sudo apt-get update
+          sudo apt-get install gcc-14 g++-14 -y
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14
+          sudo update-alternatives --set gcc /usr/bin/gcc-14
 
       - name: CCache
         uses: hendrikmuhs/ccache-action@main
@@ -70,7 +81,7 @@ jobs:
         run: |
           vcpkgCommitId=$(grep '.builtin-baseline' vcpkg.json | awk -F: '{print $2}' | tr -d '," ')
           echo "vcpkg commit ID: $vcpkgCommitId"
-          echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> $GITHUB_ENV
+          echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> "$GITHUB_ENV"
 
       - name: Get vcpkg commit id from vcpkg.json
         uses: lukka/run-vcpkg@main

CMakeLists.txt

@@ -7,38 +7,42 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 # VCPKG
 # cmake -DCMAKE_TOOLCHAIN_FILE=/opt/workspace/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-# Needed libs is in file vcpkg.json
+# Needed libs are in file vcpkg.json
 # Windows required libs: .\vcpkg install --triplet x64-windows asio pugixml spdlog curl protobuf parallel-hashmap magic-enum mio luajit libmariadb mpir abseil bshoshany-thread-pool
+
 if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-      CACHE STRING "")
+    set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+            CACHE STRING "")
 endif()
 
 if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
-  set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
+    set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
 endif()
 
 set(VCPKG_FEATURE_FLAGS "versions")
 set(VCPKG_BUILD_TYPE "release")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-
-
 # *****************************************************************************
 # Project canary
 # *****************************************************************************
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    project(canary-debug)
+    project(canary-debug LANGUAGES CXX)
 else()
-    project(canary)
+    project(canary LANGUAGES CXX)
 endif()
 
-
 # *****************************************************************************
 # Append cmake search path
 # *****************************************************************************
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
+# Configure build options for compatibility with commodity CPUs
+if(NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+endif()
+
 # *****************************************************************************
 # Include cmake tools
 # *****************************************************************************
@@ -57,7 +61,7 @@ option(FEATURE_METRICS "Enable metrics feature" OFF)
 # Options Code
 # *****************************************************************************
 
-if(FEATURE_METRIC)
+if(FEATURE_METRICS)
     log_option_enabled("metrics")
 else ()
     log_option_disabled("metrics")
@@ -69,52 +73,21 @@ if(OPTIONS_ENABLE_CCACHE)
     if(CCACHE)
         log_option_enabled("ccache")
         set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
-        else()
+    else()
         log_option_disabled("ccache")
     endif()
 endif()
 
-
 # === SCCACHE ===
 if(OPTIONS_ENABLE_SCCACHE)
-  find_program(SCCACHE_PATH sccache)
-  if(SCCACHE_PATH)
-    log_option_enabled("sccache")
-    set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH})
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH})
-  else()
-    log_option_disabled("sccache")
-  endif()
-endif()
-
-
-# === IPO ===
-if(OPTIONS_ENABLE_IPO)
-    if(MSVC)
-        log_option_enabled("IPO/LTO")
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
-        set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
+    find_program(SCCACHE_PATH sccache)
+    if(SCCACHE_PATH)
+        log_option_enabled("sccache")
+        set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH})
     else()
-        if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release")
-            log_option_enabled("IPO/LTO")
-            include(CheckIPOSupported)
-            check_ipo_supported(RESULT result OUTPUT output)
-            if(result)
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=auto")
-                message(STATUS "IPO/LTO enabled with -flto=auto for non-MSVC compiler.")
-                set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-            else()
-                log_war("IPO/LTO not supported: ${output}")
-            endif()
-        else()
-            log_option_disabled("IPO/LTO")
-        endif ()
+        log_option_disabled("sccache")
     endif()
-else()
-    log_option_disabled("IPO/LTO")
 endif()
 
 option(BUILD_TESTS "Build tests" OFF) # By default, tests will not be built
@@ -125,6 +98,6 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests
 # *****************************************************************************
 add_subdirectory(src)
 
-if(BUILD_TESTS)
+if(BUILD_TESTS OR PACKAGE_TESTS)
     add_subdirectory(tests)
 endif()