From 8cfa6c4e970c51f9cc6a686af28deef3070a355e Mon Sep 17 00:00:00 2001 From: Jaime Bautista Date: Thu, 13 Jun 2024 12:28:05 +0200 Subject: [PATCH] Update dependency versions --- .github/workflows/build.yml | 9 ++++++--- .github/workflows/release.yml | 3 ++- .github/workflows/static-analysis.yml | 3 ++- CHANGELOG.md | 8 +++++++- CMakeLists.txt | 9 +++++---- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebeebb5..681daa1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,8 @@ env: jobs: build_version: - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, Linux, X64] outputs: version: ${{ steps.version.outputs.version }} @@ -33,7 +34,8 @@ jobs: fi build: - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, Linux, X64] needs: build_version strategy: fail-fast: false # continues with matrix even if an element fails @@ -70,7 +72,8 @@ jobs: upload_to_release: # when tag is created if: ${{ github.event_name == 'release' }} - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, Linux, X64] needs: [build_version, build] strategy: fail-fast: false # continues with matrix even if an element fails diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17ab27d..6f513fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,8 @@ on: jobs: release: - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, Linux, X64] steps: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 4e3ee09..2c2ba02 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -16,7 +16,8 @@ jobs: build: name: Build - runs-on: ubuntu-22.04 + #runs-on: ubuntu-22.04 + runs-on: [self-hosted, Linux, X64] env: BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f023b0..433f704 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Changelog -## [1.3.0] - 2024-03-25 +## [1.3.0] - 2024-06-13 ### Added - Support for installing and demonizing client in procd - openwrt systems - Configuration file path can now be set through program options +- +### Changed + +- Bumped fmt to version 10.2.1 +- Bumped spdlog to version 1.14.1 + ## [1.2.2] - 2023-10-03 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fe8a07..c4afdcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ endif() # set package version SET(VERSION_MAJOR "1" CACHE STRING "Major version number") set(VERSION_MINOR "2" CACHE STRING "Minor version number") -set(VERSION_PATCH "0" CACHE STRING "Patch version number") +set(VERSION_PATCH "3" CACHE STRING "Patch version number") # add version for source code add_definitions(-DVERSION_MAJOR=${VERSION_MAJOR}) @@ -34,6 +34,7 @@ include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17) CHECK_CXX_COMPILER_FLAG("-std=c++20" COMPILER_SUPPORTS_CXX20) if(COMPILER_SUPPORTS_CXX20) + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} is using version C++20.") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20") elseif(COMPILER_SUPPORTS_CXX17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") @@ -112,8 +113,8 @@ endif() include(FetchContent) -# fmt -FetchContent_Declare(fmt URL https://github.com/fmtlib/fmt/releases/download/9.1.0/fmt-9.1.0.zip) +# fmt: required for muslcc +FetchContent_Declare(fmt URL https://github.com/fmtlib/fmt/releases/download/10.2.1/fmt-10.2.1.zip) FetchContent_MakeAvailable(fmt) list(APPEND ADDITIONAL_LIBS fmt::fmt) @@ -121,7 +122,7 @@ list(APPEND ADDITIONAL_LIBS fmt::fmt) FetchContent_Declare( spdlog GIT_REPOSITORY https://github.com/gabime/spdlog.git - GIT_TAG v1.11.0 + GIT_TAG v1.14.1 ) FetchContent_MakeAvailable(spdlog) add_compile_definitions(SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)