From 00a38c521e6ed8dcfb3237f6eadb7b2fda2e4313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miha=20=C4=8Can=C4=8Dula?= <miha@noughmad.eu>
Date: Tue, 10 Sep 2019 10:26:05 +0200
Subject: [PATCH 1/3] Update the FC submodule with the changes for GRPH-4

---
 libraries/fc       | 2 +-
 tests/cli/main.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/fc b/libraries/fc
index 94b046dce..443f858d9 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 94b046dce6bb86fd22abd1831fc9056103f4aa5d
+Subproject commit 443f858d9b4733bb6d894da9315ce00ac3246065
diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp
index 4aca6c839..f6e482a9a 100644
--- a/tests/cli/main.cpp
+++ b/tests/cli/main.cpp
@@ -210,7 +210,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 ) );

From 8cd22ee6a08713128cc0641cb33294fe699d3d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miha=20=C4=8Can=C4=8Dula?= <miha@noughmad.eu>
Date: Wed, 11 Sep 2019 12:04:04 +0200
Subject: [PATCH 2/3] Fix undefined references in cli test

---
 tests/cli/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp
index f6e482a9a..82adb1c59 100644
--- a/tests/cli/main.cpp
+++ b/tests/cli/main.cpp
@@ -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

From be60e417661098906374b150bde2459fdf581e37 Mon Sep 17 00:00:00 2001
From: Roshan Syed <r.syed@pbsa.info>
Date: Wed, 11 Sep 2019 09:53:34 -0300
Subject: [PATCH 3/3] Updated GitLab CI

---
 .gitlab-ci.yml | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9b8554cb..19bbc9e0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
\ No newline at end of file
+  tags:
+    - builder
\ No newline at end of file