Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
celllframe-node
Commits
2caa78f0
Commit
2caa78f0
authored
1 year ago
by
Roman Khlopkov
🔜
Committed by
Constantin P.
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
hotfix-9490+
parent
8eed763f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1144
hotfix-9490+
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
CMakeLists.txt
+4
-2
4 additions, 2 deletions
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
dist/etc/network/mileena/main.cfg
+2
-2
2 additions, 2 deletions
dist/etc/network/mileena/main.cfg
version.mk
+1
-1
1 addition, 1 deletion
version.mk
with
9 additions
and
7 deletions
.gitlab-ci.yml
+
1
−
1
View file @
2caa78f0
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
4
−
2
View file @
2caa78f0
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
b4f302de
Compare
d67e8b74
...
b4f302de
Subproject commit
d67e8b7425f3826ccd0a57d4ce961185b3c05447
Subproject commit
b4f302de11aef4d3c7dd13ca8ddc3c57241c01b5
This diff is collapsed.
Click to expand it.
dist/etc/network/mileena/main.cfg
+
2
−
2
View file @
2caa78f0
...
...
@@ -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=
3
0
new_round_delay=
2
0
This diff is collapsed.
Click to expand it.
version.mk
+
1
−
1
View file @
2caa78f0
VERSION_MAJOR
=
5
VERSION_MINOR
=
2
VERSION_PATCH
=
29
3
VERSION_PATCH
=
29
7
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment