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
17
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
cb403187
Commit
cb403187
authored
9 months ago
by
Dmitry Puzyrkov
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-5.3' of gitlab.demlabs.net:cellframe/cellframe-node into release-5.3
parents
ba6edfee
215a6221
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
dap-sdk
+1
-1
1 addition, 1 deletion
dap-sdk
project.yaml
+1
-1
1 addition, 1 deletion
project.yaml
with
5 additions
and
4 deletions
CMakeLists.txt
+
2
−
1
View file @
cb403187
...
@@ -59,7 +59,8 @@ if(LINUX)
...
@@ -59,7 +59,8 @@ if(LINUX)
set
(
SUPPORT_PYTHON_PLUGINS ON
)
set
(
SUPPORT_PYTHON_PLUGINS ON
)
endif
()
endif
()
set
(
CELLFRAME_MODULES
"core chains mining network srv cs-dag-poa cs-esbocs cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange srv-bridge srv-voting"
)
set
(
CELLFRAME_MODULES
"core chains mining network srv cs-dag-poa cs-esbocs cs-none
srv-app srv-app-db srv-datum srv-stake srv-xchange srv-bridge srv-voting"
)
if
(
LINUX OR DARWIN
)
if
(
LINUX OR DARWIN
)
set
(
CELLFRAME_MODULES
"
${
CELLFRAME_MODULES
}
srv-vpn"
)
set
(
CELLFRAME_MODULES
"
${
CELLFRAME_MODULES
}
srv-vpn"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
33329d69
Compare
0d97e059
...
33329d69
Subproject commit
0d97e059e58cc78e11672e41f21d6559cf1f45cb
Subproject commit
33329d69589b3007fb5cc9701530cd2e3bda4370
This diff is collapsed.
Click to expand it.
dap-sdk
@
486eee10
Compare
56b08bae
...
486eee10
Subproject commit
56b08bae8a3e57e7754a37b964255115a4b3e0bf
Subproject commit
486eee1075d70bb2183177ccc9f999bcf4936ff3
This diff is collapsed.
Click to expand it.
project.yaml
+
1
−
1
View file @
cb403187
...
@@ -11,7 +11,7 @@ build_dependencies:
...
@@ -11,7 +11,7 @@ build_dependencies:
-
'
python3-dev'
-
'
python3-dev'
-
'
curl'
-
'
curl'
-
'
jq'
-
'
jq'
-
'
xsltproc'
deploy_dependencies
:
deploy_dependencies
:
deb
:
deb
:
...
...
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