From 9caeb943616c3092f26b9b1fc2f42a971f8a85c3 Mon Sep 17 00:00:00 2001
From: naxuroqa <naxuroqa@gmail.com>
Date: Tue, 22 Jan 2019 21:14:53 +0100
Subject: [PATCH] fix(build): fixup CircleCI 2.0 config

---
 .circleci/config.yml | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f731ae01..ee3d63a54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,43 +4,49 @@ jobs:
   build:
     machine: true
     steps:
+      - checkout
       - run:
-          name : Export env
+          name : Export environment variables
           command: |
             echo 'export MAKEFLAGS="j4"' >> $BASH_ENV
             echo 'export BUILD__="x86_64"' >> $BASH_ENV
             echo 'export BTYPE__="release"' >> $BASH_ENV
+            docker info
       - run:
           name: Install zip
           command: |
             sudo apt-get update
-            sudo apt-get install zip
+            sudo apt-get install zip tree
+      - restore_cache:
+          key: dependency-cache
+          paths:
+            - ~/cache
       - run:
           name: Build stage 1
           command: |
-            docker info
-            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" ~/cache/"$BUILD__" stage1
+            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" "~/cache/${BUILD__}" stage1
       - run:
           name: Build stage 2
           command: |
-            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" ~/cache/"$BUILD__" stage2
+            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" "~/cache/${BUILD__}" stage2
             ls -al ~/cache
+      - save_cache:
+          key: dependency-cache
+          paths:
+            - ~/cache
       - run:
           name: Build stage 3
           command: |
-            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" ~/cache/"$BUILD__" stage3
-            ls -al ~/
-            ls -al ~/qTox/workspace/"$BUILD__"/qtox/"$BTYPE__"/
-            ls -al ~/qTox/workspace/"$BUILD__"/qtox/"$BTYPE__"/qtox.exe
+            ./.travis/build-windows.sh "$BUILD__" "$BTYPE__" "~/cache/${BUILD__}" stage3
       - run:
-          name: Zip artifacts
+          name: Debug info
           command: |
-            cd ~/qTox/workspace/"$BUILD__"/qtox/"$BTYPE__"/
-            zip -r qtox_"$BUILD__"_"$BTYPE__".zip *
+            ls -al ~/
+            tree ~/project/workspace -L 4
       - store_artifacts:
-          path: ~/qTox/workspace/"$BUILD__"/qtox/"$BTYPE__"/qtox.exe
+          path: "/home/circleci/project/workspace/x86_64/qtox/release/qtox-x86_64-release.zip"
       - store_artifacts:
-          path: ~/qTox/workspace/"$BUILD__"/qtox/"$BTYPE__"/qtox_"$BUILD__"_"$BTYPE__".zip
+          path: "/home/circleci/project/workspace/x86_64/qtox/release/setup-qtox-x86_64-release.exe"
 workflows:
   version: 2
   build: