From 887ad30c0b7221d4e508e46ae6183b5647f4bad0 Mon Sep 17 00:00:00 2001
From: Roshan Syed <r.syed@pbsa.info>
Date: Wed, 11 Sep 2019 11:26:00 -0300
Subject: [PATCH] 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 a9b8554c..19bbc9e0 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