Skip to content
Snippets Groups Projects
Commit 0fa90a9e authored by Constantin Papizh's avatar Constantin Papizh
Browse files

Local merge with master

parents d68677e4 cc888895
No related branches found
No related tags found
2 merge requests!35Master,!31various fixes, version up
# Prerequisites # Prerequisites
build/* build/*
build_stretch/*
test/build test/build
*.d *.d
*.txt.user *.txt.user
......
...@@ -10,4 +10,4 @@ kelvin-node-schedule: ...@@ -10,4 +10,4 @@ kelvin-node-schedule:
stage: build stage: build
tags: tags:
- kelvin-node - kelvin-node
script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-node && ~/production/integration/gitlab-CI/travis_test.sh script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-node && ~/production/integration/reprepro/publish.sh debian.pub.demlabs.net stretch main && ~/production/integration/gitlab-CI/travis_test.sh
...@@ -47,9 +47,6 @@ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" ) ...@@ -47,9 +47,6 @@ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "CellFrame Node software ( https://cellframe.net ) " ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "CellFrame Node software ( https://cellframe.net ) " )
SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "CellFrame Node" ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "CellFrame Node" )
SET( CPACK_DEBIAN_PACKAGE_SECTION "extra") SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
#SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "debian-9.7-amd64" )
#SET( CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
#SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" )
SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc") SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc")
SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
......
...@@ -7,7 +7,7 @@ type=development ...@@ -7,7 +7,7 @@ type=development
# Possible values: light, full, archive, master, root # Possible values: light, full, archive, master, root
node-role=full node-role=full
#node-alias=addr-%node_addr% #node-alias=addr-%node_addr%
gdb_groups_prefix=kelvin.testnet gdb_groups_prefix=kelvin-testnet
seed_nodes_hostnames=[0.root.testnet.klvn.io,1.root.testnet.klvn.io,2.root.testnet.klvn.io,3.root.testnet.klvn.io,4.root.testnet.klvn.io] seed_nodes_hostnames=[0.root.testnet.klvn.io,1.root.testnet.klvn.io,2.root.testnet.klvn.io,3.root.testnet.klvn.io,4.root.testnet.klvn.io]
seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4] seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment