morpheus

commit ce8f48af43a0e0cf05a3ac446805a290e0dcb18a
parent e2235c1d272f9513e81b3f80bbe0a98aae342831
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Wed,  6 Dec 2017 17:06:39 +0100

Merge pull request #42 from Nordgedanken/develop

Switch Windows CI to CircleCI
Diffstat:
M
.circleci/config.yml
 | 
76
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
M
README.md
 | 
5
++---

2 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  build:
+  prepare:
     docker:
       - image: therecipe/qt:linux
         environment:
@@ -9,11 +9,81 @@ jobs:
       - run:
           name: Get Morpheus
           command: go get -u -v -d github.com/Nordgedanken/Morpheus/...
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory
+          root: /home/user/work/
+          # Must be relative path from root
+          paths:
+            - src/
+  build_linux:
+    docker:
+      - image: therecipe/qt:linux
+        environment:
+          DESKTOP: true
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /home/user/work/
+      - run:
+          name: Run Build
+          working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
+          command: $GOPATH/bin/qtdeploy build linux
+  test_linux:
+    docker:
+      - image: therecipe/qt:linux
+        environment:
+          DESKTOP: true
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /home/user/work/
+      - run:
+          name: Run Tests
+          working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
+          command: $GOPATH/bin/qtdeploy test linux
+  build_win_static:
+    docker:
+      - image: therecipe/qt:windows_64_static
+        environment:
+          DESKTOP: true
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /home/user/work/
       - run:
           name: Run Build
           working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
-          command: $GOPATH/bin/qtdeploy build desktop
+          command: $GOPATH/bin/qtdeploy build windows
+  test_win_static:
+    docker:
+      - image: therecipe/qt:windows_64_static
+        environment:
+          DESKTOP: true
+    steps:
+      - attach_workspace:
+          # Must be absolute path or relative path from working_directory
+          at: /home/user/work/
       - run:
           name: Run Tests
           working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
-          command: $GOPATH/bin/qtdeploy test desktop
+          command: $GOPATH/bin/qtdeploy test windows
+workflows:
+  version: 2
+  build-test-linux:
+    jobs:
+      - prepare
+      - build_linux:
+          requires:
+            - prepare
+      - test_linux:
+          requires:
+            - prepare
+  build-test-win:
+      jobs:
+        - prepare
+        - build_win_static:
+            requires:
+              - prepare
+        - test_win_static:
+            requires:
+              - prepare
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # Morpheus
-[![CircleCI branch](https://img.shields.io/circleci/project/github/Nordgedanken/Morpheus/master.svg)](https://circleci.com/gh/Nordgedanken/Morpheus)  [![Build status](https://ci.appveyor.com/api/projects/status/a0ke0029ely9w7hu?svg=true)](https://ci.appveyor.com/project/MTRNord/neo)
-
-_Appveyor CI is known to be broken_
+[![CircleCI branch](https://img.shields.io/circleci/project/github/Nordgedanken/Morpheus/master.svg)](https://circleci.com/gh/Nordgedanken/Morpheus)
 
+[![Github All Releases](https://img.shields.io/github/downloads/Nordgedanken/Morpheus/total.svg)]()
 ---
 
 A Matrix client written in Go-QT