41.diff (10942B)
1 diff --git a/.ci/linux.sh b/.ci/linux.sh 2 deleted file mode 100644 3 index 6d65677..0000000 4 --- a/.ci/linux.sh 5 +++ /dev/null 6 @@ -1,43 +0,0 @@ 7 -#!/bin/bash 8 -set -ev 9 - 10 -#check env 11 -df -h 12 - 13 -ls $HOME/* 14 -du -sh $HOME/* 15 - 16 -#needed for headless qt installation 17 -export QT_QPA_PLATFORM=minimal 18 - 19 -#additional deps for multimedia 20 -sudo apt-get -y -qq install libpulse-dev && sudo apt-get -qq clean 21 - 22 -#replace gcc4 with gcc5 23 -sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test 24 -sudo apt-get -qq update 25 -sudo apt-get -y -qq install gcc-5 g++-5 && sudo apt-get -qq clean 26 -sudo rm -f /usr/bin/gcc; sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc 27 -sudo rm -f /usr/bin/g++; sudo ln -s /usr/bin/g++-5 /usr/bin/g++ 28 - 29 -#download and install qt 30 -sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty 31 -sudo apt-get -qq update 32 -sudo apt-get -y -qq install qt583d qt58base qt58canvas3d qt58charts-no-lgpl qt58connectivity qt58creator qt58datavis3d-no-lgpl qt58declarative qt58doc qt58gamepad qt58graphicaleffects qt58imageformats qt58location qt58multimedia qt58qbs qt58quickcontrols qt58quickcontrols2 qt58script qt58scxml qt58sensors qt58serialbus qt58serialport qt58svg qt58tools qt58translations qt58virtualkeyboard-no-lgpl qt58webchannel qt58webengine qt58websockets qt58x11extras qt58xmlpatterns qt58speech qt58networkauth-no-lgpl && sudo apt-get -qq clean 33 -QT=qt-unified-linux-x64-online.run 34 -curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT https://download.qt.io/official_releases/online_installers/$QT 35 -chmod +x /tmp/$QT 36 -/tmp/$QT --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs 37 -rm -f /tmp/$QT 38 - 39 -#prepare env 40 -sudo chown $USER /usr/local/bin 41 -sudo chown $USER $GOROOT/pkg | true 42 - 43 -#check env 44 -df -h 45 - 46 -ls $HOME/* 47 -du -sh $HOME/* 48 - 49 -exit 0 50 diff --git a/.circleci/config.yml b/.circleci/config.yml 51 new file mode 100644 52 index 0000000..75c8a1b 53 --- /dev/null 54 +++ b/.circleci/config.yml 55 @@ -0,0 +1,19 @@ 56 +version: 2 57 +jobs: 58 + build: 59 + docker: 60 + - image: therecipe/qt:linux 61 + environment: 62 + DESKTOP: true 63 + steps: 64 + - run: 65 + name: Get Morpheus 66 + command: go get -u -v -d github.com/Nordgedanken/Morpheus/... 67 + - run: 68 + name: Run Build 69 + working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/ 70 + command: $GOPATH/bin/qtdeploy build desktop 71 + - run: 72 + name: Run Tests 73 + working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/ 74 + command: $GOPATH/bin/qtdeploy test desktop 75 diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md 76 new file mode 100644 77 index 0000000..5e0d4a7 78 --- /dev/null 79 +++ b/.github/ISSUE_TEMPLATE.md 80 @@ -0,0 +1,32 @@ 81 +Issue tracker is **ONLY** used for reporting bugs. NO NEW FEATURE ACCEPTED! Use the [Matrix Room](https://matrix.to/#/#Morpheus:matrix.ffslfl.net) for supporting issues. 82 + 83 +<!--- Provide a general summary of the issue in the Title above --> 84 + 85 +## Expected Behavior 86 +<!--- Tell us what should happen --> 87 + 88 +## Current Behavior 89 +<!--- Tell us what happens instead of the expected behavior --> 90 + 91 +## Possible Solution 92 +<!--- Not obligatory, but suggest a fix/reason for the bug, --> 93 + 94 +## Steps to Reproduce 95 +<!--- Provide a link to a live example, or an unambiguous set of steps to --> 96 +<!--- reproduce this bug. Include code to reproduce, if relevant --> 97 +1. 98 +2. 99 +3. 100 +4. 101 + 102 +## Context (Environment) 103 +<!--- How has this issue affected you? What are you trying to accomplish? --> 104 +<!--- Providing context helps us come up with a solution that is most useful in the real world --> 105 + 106 +<!--- Provide a general summary of the issue in the Title above --> 107 + 108 +## Detailed Description 109 +<!--- Provide a detailed description of the change or addition you are proposing --> 110 + 111 +## Possible Implementation 112 +<!--- Not obligatory, but suggest an idea for implementing addition or change --> 113 \ No newline at end of file 114 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md 115 new file mode 100644 116 index 0000000..b04be77 117 --- /dev/null 118 +++ b/CONTRIBUTING.md 119 @@ -0,0 +1,90 @@ 120 +# Contributing 121 + 122 +When contributing to this repository, please first discuss the change you wish to make via issue, 123 +[matrix](https://matrix.to/#/#Morpheus:matrix.ffslfl.net), or any other method with the owners of this repository before making a change. 124 + 125 +Please note we have a code of conduct, please follow it in all your interactions with the project. 126 + 127 +## Pull Request Process 128 + 129 +1. Ensure any install or build dependencies are removed before the end of the layer when doing a 130 + build. 131 +2. Update the README.md with details of changes to the interface, this includes new environment 132 + variables, useful file locations. 133 +<!--3. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 134 + do not have permission to do that, you may request the second reviewer to merge it for you. --> 135 + 136 +## Code of Conduct 137 + 138 +### Our Pledge 139 + 140 +In the interest of fostering an open and welcoming environment, we as 141 +contributors and maintainers pledge to making participation in our project and 142 +our community a harassment-free experience for everyone, regardless of age, body 143 +size, disability, ethnicity, gender identity and expression, level of experience, 144 +nationality, personal appearance, race, religion, or sexual identity and 145 +orientation. 146 + 147 +### Our Standards 148 + 149 +Examples of behavior that contributes to creating a positive environment 150 +include: 151 + 152 +* Using welcoming and inclusive language 153 +* Being respectful of differing viewpoints and experiences 154 +* Gracefully accepting constructive criticism 155 +* Focusing on what is best for the community 156 +* Showing empathy towards other community members 157 + 158 +Examples of unacceptable behavior by participants include: 159 + 160 +* The use of sexualized language or imagery and unwelcome sexual attention or 161 +advances 162 +* Trolling, insulting/derogatory comments, and personal or political attacks 163 +* Public or private harassment 164 +* Publishing others' private information, such as a physical or electronic 165 + address, without explicit permission 166 +* Other conduct which could reasonably be considered inappropriate in a 167 + professional setting 168 + 169 +### Our Responsibilities 170 + 171 +Project maintainers are responsible for clarifying the standards of acceptable 172 +behavior and are expected to take appropriate and fair corrective action in 173 +response to any instances of unacceptable behavior. 174 + 175 +Project maintainers have the right and responsibility to remove, edit, or 176 +reject comments, commits, code, wiki edits, issues, and other contributions 177 +that are not aligned to this Code of Conduct, or to ban temporarily or 178 +permanently any contributor for other behaviors that they deem inappropriate, 179 +threatening, offensive, or harmful. 180 + 181 +### Scope 182 + 183 +This Code of Conduct applies both within project spaces and in public spaces 184 +when an individual is representing the project or its community. Examples of 185 +representing a project or community include using an official project [matrix 186 +room](https://matrix.to/#/#Morpheus:matrix.ffslfl.net), posting via an official social media account, or acting as an appointed 187 +representative at an online or offline event. Representation of a project may be 188 +further defined and clarified by project maintainers. 189 + 190 +### Enforcement 191 + 192 +Instances of abusive, harassing, or otherwise unacceptable behavior may be 193 +reported by contacting the project team at "info [at] nordgedanken [dot] de". All 194 +complaints will be reviewed and investigated and will result in a response that 195 +is deemed necessary and appropriate to the circumstances. The project team is 196 +obligated to maintain confidentiality with regard to the reporter of an incident. 197 +Further details of specific enforcement policies may be posted separately. 198 + 199 +Project maintainers who do not follow or enforce the Code of Conduct in good 200 +faith may face temporary or permanent repercussions as determined by other 201 +members of the project's leadership. 202 + 203 +### Attribution 204 + 205 +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, 206 +available at [http://contributor-covenant.org/version/1/4][version] 207 + 208 +[homepage]: http://contributor-covenant.org 209 +[version]: http://contributor-covenant.org/version/1/4/ 210 \ No newline at end of file 211 diff --git a/README.md b/README.md 212 index 5d24fd0..250ab30 100644 213 --- a/README.md 214 +++ b/README.md 215 @@ -1,11 +1,33 @@ 216 # Morpheus 217 -[](https://circleci.com/gh/Nordgedanken/Morpheus) [](https://ci.appveyor.com/project/MTRNord/neo) 218 +[](https://circleci.com/gh/Nordgedanken/Morpheus) [](https://ci.appveyor.com/project/MTRNord/neo) 219 + 220 +_Appveyor CI is known to be broken_ 221 + 222 +--- 223 224 A Matrix client written in Go-QT 225 226 -# How to build 227 +## Contributing - Matrix Room 228 +Join the Matrix Room at [#Morpheus:matrix.ffslfl.net](https://matrix.to/#/#Morpheus:matrix.ffslfl.net) 229 +Read the [Contribution Guideline](CONTRIBUTING.md) 230 + 231 +## How to build 232 +### Prerequisites 233 +1. https://github.com/therecipe/qt 234 + * Follow https://github.com/therecipe/qt/wiki/Installation 235 +2. Clone this repo by doing `go get -u github.com/Nordgedanken/Morpheus` 236 + 237 +### Build 238 +1. Run `qtdeploy build desktop` inside `$GOPATH/src/github.com/Nordgedanken/Morpheus` 239 +2. Run the Application from within `deploy/**` 240 + 241 + 242 +## Versioning 243 +We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/Nordgedanken/Morpheus/tags). 244 + 245 + 246 +## License 247 +This project is licensed under the GPLv3 License - see the [LICENSE](LICENSE) file for details 248 249 -1. Follow https://github.com/therecipe/qt#installation 250 -2. Run `go get -u github.com/Nordgedanken/Morpheus` to clone this Repo 251 -3. Run `qtdeploy build desktop .` inside `$GOPATH/src/github.com/Nordgedanken/Morpheus` 252 -4. Run the Application from within `deploy/windows` 253 +## Acknowledgments 254 +* Inspired by [nheko](http://github.com/mujx/nheko) 255 diff --git a/circle.yml b/circle.yml 256 deleted file mode 100644 257 index b8690c9..0000000 258 --- a/circle.yml 259 +++ /dev/null 260 @@ -1,19 +0,0 @@ 261 -machine: 262 - environment: 263 - OS: linux 264 - DESKTOP: true 265 - GOROOT: /usr/local/go 266 - GOPATH: /home/ubuntu/.go_project 267 -dependencies: 268 - pre: 269 - override: 270 - - go get -u -v github.com/therecipe/qt/cmd/... 271 - - if [[ "$OS" == "linux" ]]; then chmod +x ./.ci/linux.sh && ./.ci/linux.sh; fi 272 - - /home/ubuntu/.go_project/bin/qtsetup full desktop 273 - - go get -v github.com/Nordgedanken/Morpheus/... 274 - post: 275 -test: 276 - pre: 277 - override: 278 - - if [[ "$DESKTOP" == "true" ]]; then /home/ubuntu/.go_project/bin/qtsetup && /home/ubuntu/.go_project/bin/qtdeploy test desktop; fi 279 - post: