sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bls|ci: Fix C++17 build, add it to CI (#4055)

Browse Source 
* ci: Add C++17 build

* bls: Add explicit CBLSSecretKey copy ctor and operator=
This commit is contained in:
UdjinM6 2021-04-28 17:44:01 +03:00 committed by GitHub
parent 08ebd31fdb
commit 704d34b2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -237,6 +237,13 @@ linux64-build:
variables: variables:
BUILD_TARGET: linux64 BUILD_TARGET: linux64
linux64_cxx17-build:
extends: .build-template
needs:
- x86_64-unknown-linux-gnu-debug
variables:
BUILD_TARGET: linux64_cxx17
linux64_nowallet-build: linux64_nowallet-build:
extends: extends:
- .build-template - .build-template

8
ci/matrix.sh
View File

@ -67,6 +67,14 @@ elif [ "$BUILD_TARGET" = "linux64" ]; then
export PYZMQ=true export PYZMQ=true
export RUN_UNITTESTS=true export RUN_UNITTESTS=true
export RUN_INTEGRATIONTESTS=true export RUN_INTEGRATIONTESTS=true
elif [ "$BUILD_TARGET" = "linux64_cxx17" ]; then
export HOST=x86_64-unknown-linux-gnu
export DEP_OPTS="NO_UPNP=1 DEBUG=1"
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks --enable-c++17"
export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
export PYZMQ=true
export RUN_UNITTESTS=true
export RUN_INTEGRATIONTESTS=true
elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
export HOST=x86_64-unknown-linux-gnu export HOST=x86_64-unknown-linux-gnu
export DEP_OPTS="NO_WALLET=1" export DEP_OPTS="NO_WALLET=1"

2
src/bls/bls.h
View File

@ -231,6 +231,8 @@ public:
using CBLSWrapper::CBLSWrapper; using CBLSWrapper::CBLSWrapper;
CBLSSecretKey() {} CBLSSecretKey() {}
CBLSSecretKey(const CBLSSecretKey&) = default;
CBLSSecretKey& operator=(const CBLSSecretKey&) = default;
void AggregateInsecure(const CBLSSecretKey& o); void AggregateInsecure(const CBLSSecretKey& o);
static CBLSSecretKey AggregateInsecure(const std::vector<CBLSSecretKey>& sks); static CBLSSecretKey AggregateInsecure(const std::vector<CBLSSecretKey>& sks);