Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the FC submodule with the changes for GRPH-4 #121

Merged
merged 3 commits into from
Sep 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 18 additions & 26 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
stages:
- pull
- build
- test

before_script:
- cd /var/www/Projects/595.peerplays/blockchain

pulljob:
stage: pull
script:
- git pull origin master
only:
- master
tags:
- pp-dev

buildjob:
build:
stage: build
script:
- git submodule update --init --recursive
- cmake .
- make
only:
- master
tags:
- pp-dev

testjob:
- make -j$(nproc)
artifacts:
untracked: true
paths:
- libraries/
- programs/
- tests/
tags:
- builder

test:
stage: test
dependencies:
- build
script:
- ./tests/betting_test
- ./tests/chain_test
- ./tests/tournament_test
only:
- master
tags:
- pp-dev
tags:
- builder
2 changes: 1 addition & 1 deletion libraries/fc
3 changes: 2 additions & 1 deletion tests/cli/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <fc/crypto/base58.hpp>

#include <fc/crypto/aes.hpp>
#include <fc/smart_ref_impl.hpp>

#ifdef _WIN32
#ifndef _WIN32_WINNT
Expand Down Expand Up @@ -210,7 +211,7 @@ class client_connection
wallet_data.ws_password = "";
websocket_connection = websocket_client.connect( wallet_data.ws_server );

api_connection = std::make_shared<fc::rpc::websocket_api_connection>(*websocket_connection);
api_connection = std::make_shared<fc::rpc::websocket_api_connection>(websocket_connection);

remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1);
BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) );
Expand Down