Skip to content

Commit

Permalink
chore: Upgrade Hedera Protobufs to v0.47.0 (#41)
Browse files Browse the repository at this point in the history
Signed-off-by: gsstoykov <[email protected]>
  • Loading branch information
gsstoykov authored Feb 7, 2024
1 parent a20c83e commit 5dabd1b
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 67 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/zxc-build-library.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
echo "::group::Show SemVer Binary Version Info"
semver --version
echo "::endgroup::"
- name: Validate HAPI Version Tag
id: version
run: |
Expand All @@ -43,7 +43,7 @@ jobs:
echo "::error title=Version Error::The supplied hapi-version-tag parameter (${HAPI_VERSION}) is invalid and does not conform to the semantic versioning specifications."
exit 2
fi
[[ "${HAPI_VERSION}" == v* ]] || HAPI_VERSION="v${HAPI_VERSION}"
echo "number=${HAPI_VERSION}" >> "${GITHUB_OUTPUT}"
Expand All @@ -59,10 +59,10 @@ jobs:
include:
- os: Linux
preset: linux-x64
# - os: macos-latest
# preset: macos-x64
# - os: windows-latest
# preset: windows-x64
# - os: macos-latest
# preset: macos-x64
# - os: windows-latest
# preset: windows-x64
needs:
- hapi-version
steps:
Expand All @@ -88,6 +88,11 @@ jobs:
with:
binaryCachePath: ${{ github.workspace }}/b/vcpkg_cache

- name: Convert VCPkg to Full Clone
run: |
cd vcpkg
git fetch --unshallow --prune
- name: CMake Build (Debug)
uses: lukka/run-cmake@v10
with:
Expand Down
51 changes: 0 additions & 51 deletions BuildOpenSSL.cmake

This file was deleted.

8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.21...3.24)
project(hedera-protobufs-cpp VERSION 0.1.0 DESCRIPTION "Hedera C++ Protobuf Library" LANGUAGES CXX)
project(hedera-protobufs-cpp VERSION 0.47.0 DESCRIPTION "Hedera C++ Protobuf Library" LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand All @@ -10,20 +10,20 @@ include(FetchContent)

set(Protobuf_USE_STATIC_LIBS ON)

include(BuildOpenSSL.cmake)
set(gRPC_SSL_PROVIDER package)

find_package(OpenSSL REQUIRED)
find_package(ZLIB REQUIRED)
find_package(Protobuf REQUIRED)
find_package(gRPC CONFIG REQUIRED)
find_package(re2 CONFIG REQUIRED)
find_package(c-ares CONFIG REQUIRED)
find_package(absl CONFIG REQUIRED)

set(HAPI_VERSION_TAG "v0.44.0" CACHE STRING "Use the configured version tag for the Hedera API protobufs")
set(HAPI_VERSION_TAG "v0.47.0" CACHE STRING "Use the configured version tag for the Hedera API protobufs")

if (HAPI_VERSION_TAG STREQUAL "")
set(HAPI_VERSION_TAG "v0.44.0")
set(HAPI_VERSION_TAG "v0.47.0")
endif ()

# Fetch the protobuf definitions
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 8157 files
27 changes: 22 additions & 5 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
{
"name": "hedera-protobufs-cpp",
"version-string": "0.30.0",
"version-string": "0.1.0",
"builtin-baseline": "680071397677bb123b2f2b0ebe73905feae4a955",
"dependencies": [
"zlib",
"protobuf",
"grpc",
"upb"
{
"name": "openssl",
"version>=": "3.2.0#2"
},
{
"name": "zlib",
"version>=": "1.2.12"
},
{
"name": "protobuf",
"version>=": "3.21.6"
},
{
"name": "grpc",
"version>=": "1.49.0"
},
{
"name": "upb",
"version>=": "2022-06-21"
}
]
}

0 comments on commit 5dabd1b

Please sign in to comment.