From 2caa78f0843ff57d0f84db45a60452a865b94846 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Fri, 8 Sep 2023 10:28:25 +0000
Subject: [PATCH] hotfix-9490+
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 6 ++++--
cellframe-sdk | 2 +-
dist/etc/network/mileena/main.cfg | 4 ++--
version.mk | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b06d0594..585b04012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,7 +94,7 @@ linux-amd64-debian-buster:
- ./prod_build/build.sh --target linux release -DBUILD_WITH_PYTHON_ENV=ON -DBUILD_DIAGTOOL=ON
- ./prod_build/pack.sh --target linux release
- /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb
- - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_linux_release/*-amd64.deb --redirect-from linux/cellframe-node/
+ - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_linux_release/*-amd64.deb --redirect-from linux/cellframe-node/latest-amd64
- anybadge -l "node version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f node-version-badge.svg -c blue
- /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ ./node-version-badge.svg || true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a991d96b..51e2acfa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,9 @@ if(UNIX AND NOT WIN32)
message(" Downloading static prebuild cpython3.10...")
#this python was build by compiling and installing static python distrip to /opt/cellframe-node/ and
# installing pip in it, then tared all back.
- cmake_policy(SET CMP0135 NEW)
+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
+ cmake_policy(SET CMP0135 NEW)
+ endif()
if(CMAKE_BUILD_TYPE MATCHES Debug)
FetchContent_Declare(
CPython310StaticDebug
@@ -290,7 +292,7 @@ if(UNIX AND NOT WIN32)
list(APPEND Python_LIBRARIES ssl_lib crypto_lib crypt nsl z util expat)
endif()
else()
- if(NOT ${CMAKE_VERSION} VERSION_LESS "3.15")
+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15")
cmake_policy(SET CMP0094 NEW)
endif()
find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
diff --git a/cellframe-sdk b/cellframe-sdk
index d67e8b742..b4f302de1 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit d67e8b7425f3826ccd0a57d4ce961185b3c05447
+Subproject commit b4f302de11aef4d3c7dd13ca8ddc3c57241c01b5
diff --git a/dist/etc/network/mileena/main.cfg b/dist/etc/network/mileena/main.cfg
index 1f66f7203..a380b7ff9 100755
--- a/dist/etc/network/mileena/main.cfg
+++ b/dist/etc/network/mileena/main.cfg
@@ -18,8 +18,8 @@ is_static_genesis_event=true
static_genesis_event=0x1DB1E136B583A1553E4829D6A0453338B7413DDB1B12189F8456B064E822667F
[esbocs]
-#consensus_debug=true
+consensus_debug=true
min_validators_count=2
auth_certs_prefix=mileena.master
validators_addrs=[CCCC::1234::0000::0000,CCCC::1234::0000::0001]
-new_round_delay=30
+new_round_delay=20
diff --git a/version.mk b/version.mk
index 177feecbc..d305bf333 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
VERSION_MAJOR=5
VERSION_MINOR=2
-VERSION_PATCH=293
+VERSION_PATCH=297
--
GitLab