morpheus.meta

Issues/PRs archive for Nordgedanken/Morpheus
git clone git://archive.git.mtrnord.blog/Nordgedanken/morpheus.meta.git
Log | Files | Refs

42.diff (3672B)

      1 diff --git a/.circleci/config.yml b/.circleci/config.yml
      2 index 75c8a1b..8608ac7 100644
      3 --- a/.circleci/config.yml
      4 +++ b/.circleci/config.yml
      5 @@ -1,6 +1,6 @@
      6  version: 2
      7  jobs:
      8 -  build:
      9 +  prepare:
     10      docker:
     11        - image: therecipe/qt:linux
     12          environment:
     13 @@ -9,11 +9,81 @@ jobs:
     14        - run:
     15            name: Get Morpheus
     16            command: go get -u -v -d github.com/Nordgedanken/Morpheus/...
     17 +      - persist_to_workspace:
     18 +          # Must be an absolute path, or relative path from working_directory
     19 +          root: /home/user/work/
     20 +          # Must be relative path from root
     21 +          paths:
     22 +            - src/
     23 +  build_linux:
     24 +    docker:
     25 +      - image: therecipe/qt:linux
     26 +        environment:
     27 +          DESKTOP: true
     28 +    steps:
     29 +      - attach_workspace:
     30 +          # Must be absolute path or relative path from working_directory
     31 +          at: /home/user/work/
     32 +      - run:
     33 +          name: Run Build
     34 +          working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
     35 +          command: $GOPATH/bin/qtdeploy build linux
     36 +  test_linux:
     37 +    docker:
     38 +      - image: therecipe/qt:linux
     39 +        environment:
     40 +          DESKTOP: true
     41 +    steps:
     42 +      - attach_workspace:
     43 +          # Must be absolute path or relative path from working_directory
     44 +          at: /home/user/work/
     45 +      - run:
     46 +          name: Run Tests
     47 +          working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
     48 +          command: $GOPATH/bin/qtdeploy test linux
     49 +  build_win_static:
     50 +    docker:
     51 +      - image: therecipe/qt:windows_64_static
     52 +        environment:
     53 +          DESKTOP: true
     54 +    steps:
     55 +      - attach_workspace:
     56 +          # Must be absolute path or relative path from working_directory
     57 +          at: /home/user/work/
     58        - run:
     59            name: Run Build
     60            working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
     61 -          command: $GOPATH/bin/qtdeploy build desktop
     62 +          command: $GOPATH/bin/qtdeploy build windows
     63 +  test_win_static:
     64 +    docker:
     65 +      - image: therecipe/qt:windows_64_static
     66 +        environment:
     67 +          DESKTOP: true
     68 +    steps:
     69 +      - attach_workspace:
     70 +          # Must be absolute path or relative path from working_directory
     71 +          at: /home/user/work/
     72        - run:
     73            name: Run Tests
     74            working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/
     75 -          command: $GOPATH/bin/qtdeploy test desktop
     76 +          command: $GOPATH/bin/qtdeploy test windows
     77 +workflows:
     78 +  version: 2
     79 +  build-test-linux:
     80 +    jobs:
     81 +      - prepare
     82 +      - build_linux:
     83 +          requires:
     84 +            - prepare
     85 +      - test_linux:
     86 +          requires:
     87 +            - prepare
     88 +  build-test-win:
     89 +      jobs:
     90 +        - prepare
     91 +        - build_win_static:
     92 +            requires:
     93 +              - prepare
     94 +        - test_win_static:
     95 +            requires:
     96 +              - prepare
     97 diff --git a/README.md b/README.md
     98 index 250ab30..b1d7cbf 100644
     99 --- a/README.md
    100 +++ b/README.md
    101 @@ -1,8 +1,7 @@
    102  # Morpheus
    103 -[![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)
    104 -
    105 -_Appveyor CI is known to be broken_
    106 +[![CircleCI branch](https://img.shields.io/circleci/project/github/Nordgedanken/Morpheus/master.svg)](https://circleci.com/gh/Nordgedanken/Morpheus)
    107  
    108 +[![Github All Releases](https://img.shields.io/github/downloads/Nordgedanken/Morpheus/total.svg)]()
    109  ---
    110  
    111  A Matrix client written in Go-QT