Skip to content

Commit fa4c738

Browse files
committed
chore: update dependencies and version numbers in CMake files
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 23e5294 commit fa4c738

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ jobs:
4141
run: |
4242
sudo apt update
4343
sudo apt -y install cmake
44-
sudo git clone -b v9.1.0 https://github.com/apache/skywalking-data-collect-protocol.git ./3rdparty/skywalking-data-collect-protocol
45-
sudo git clone -b v1.46.6 https://github.com/grpc/grpc.git --recursive
44+
sudo git clone https://github.com/apache/skywalking-data-collect-protocol.git ./3rdparty/skywalking-data-collect-protocol
45+
cd ./3rdparty/skywalking-data-collect-protocol && sudo git checkout fb3fb005650e2489164978b7804117c7ade1529a && cd ../..
46+
sudo git clone -b v1.74.1 https://github.com/grpc/grpc.git --recursive
4647
sudo cmake -S ./grpc -B ./grpc/build
4748
sudo cmake --build ./grpc/build --parallel 8 --target install
4849
sudo cmake -S . -B ./build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if(POLICY CMP0091)
55
endif()
66

77
project(cpp2sky
8-
VERSION 0.5.1
8+
VERSION 0.6.1
99
DESCRIPTION "Distributed tracing and monitor SDK in CPP for Apache SkyWalking APM"
1010
HOMEPAGE_URL "https://github.com/SkyAPM/cpp2sky"
1111
)

cmake/grpc.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ elseif(GRPC_FETCHCONTENT)
7272
include(FetchContent)
7373
FetchContent_Declare(
7474
grpc
75-
URL https://github.com/grpc/grpc/archive/a3ae8e00a2c5553c806e83fae83e33f0198913f0.tar.gz
76-
URL_HASH SHA256=1ccc2056b68b81ada8df61310e03dfa0541c34821fd711654d0590a7321db9c8
75+
URL https://github.com/grpc/grpc/archive/refs/tags/v1.74.1.tar.gz
76+
URL_HASH SHA256=7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228
7777
)
7878
FetchContent_MakeAvailable(grpc)
7979

cmake/httplib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ elseif(HTTPLIB_FETCHCONTENT)
1717
include(add_FetchContent_MakeAvailable.cmake)
1818
endif()
1919

20-
set(HTTPLIB_GIT_TAG v0.7.15)
20+
set(HTTPLIB_GIT_TAG v0.22.0)
2121
set(HTTPLIB_GIT_URL https://github.com/yhirose/cpp-httplib.git)
2222

2323
FetchContent_Declare(

cmake/spdlog.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ elseif(SPDLOG_FETCHCONTENT)
2020
include(add_FetchContent_MakeAvailable.cmake)
2121
endif()
2222

23-
set(SPDLOG_GIT_TAG v1.9.2)
23+
set(SPDLOG_GIT_TAG v1.10.0)
2424
set(SPDLOG_GIT_URL https://github.com/gabime/spdlog.git)
2525

2626
FetchContent_Declare(

0 commit comments

Comments
 (0)