Skip to content

Commit

Permalink
Update dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
bautisflow committed Jun 13, 2024
1 parent 02999b9 commit 8cfa6c4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:

jobs:
release:
runs-on: ubuntu-latest
#runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]

steps:

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand All @@ -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")
Expand Down Expand Up @@ -112,16 +113,16 @@ 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)

# spdlog
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)
Expand Down

0 comments on commit 8cfa6c4

Please sign in to comment.