Skip to content

Commit

Permalink
Added Donate Option. Added Continuous Integration with TravisCI. Adde…
Browse files Browse the repository at this point in the history
…d make install way to install after build. New option to users, now it's possible report bugs into app. Changed internal app icons theme. Explained how to compile the application in Ubuntu 18.04 or earlier, due to the incompatibility of MystiQ with Qt5 <= 5.9. Added from the help menu, a link to send donations to the project
  • Loading branch information
llamaret committed Nov 28, 2019
1 parent 5da06c2 commit 1386732
Show file tree
Hide file tree
Showing 119 changed files with 4,694 additions and 453 deletions.
33 changes: 2 additions & 31 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ install:
- sudo add-apt-repository -y ppa:beineri/opt-qt-5.12.3-bionic
- sudo apt update
- sudo apt install build-essential g++ make ffmpeg sox mplayer libnotify-dev mesa-common-dev libglvnd-dev
- sudo apt install qt-latest tree
- sudo apt install qt-latest
- echo "/opt/qt512/bin" | sudo tee /etc/xdg/qtchooser/default.conf
- echo "/opt/qt512/lib" | sudo tee -a /etc/xdg/qtchooser/default.conf
- qtchooser -print-env
Expand All @@ -26,39 +26,10 @@ install:
script:
- qmake mystiq.pro
- make
- sudo make install

# notifications (only via telegram)
notifications:
email: true
#webhooks: https://fathomless-fjord-24024.herokuapp.com/notify

# make the AppImage bundle
before_deploy:
# install AppImage toolchain
- wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
- wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
- wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
- chmod +x *.AppImage
# build the AppDir
- make install INSTALL_ROOT=AppDir
# add extra tools
- ./complete_appdir.sh
# run the linuxdeploy script
- ./linuxdeploy-x86_64.AppImage --appdir=AppDir --plugin qt --output appimage
# listing the result
- ls -lh *.AppImage

# deploy to Github
deploy:
# deploy on linux
provider: releases
api_key: $OAUTHTOKEN
file_glob: true
draft: true
overwrite: true
skip_cleanup: true
on:
repo: llamaret/MystiQ
tags: true
file: "Mystiq*AppImage"
# no deploy section for now.
44 changes: 44 additions & 0 deletions Developer_process.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Developer process & workflows

This document stablish the process and workflows as per github and gitflow good practices (in some cases simplified and relaxed), if in doubt please take a peek [here](https://medium.com/@devmrin/learn-complete-gitflow-workflow-basics-how-to-from-start-to-finish-8756ad5b7394) or [here](https://nvie.com/posts/a-successful-git-branching-model/)

This practices must appear so "elite" or "cathedral style" at first, but believe me you will thanks me for teaching you this if you pretend to work for a bigger or professional soft company. At the end and with the time you will see how easy is to pin-point any info from the entangle of branches, issues, travis, etc.

At first we will be easy with this but people, please catch the (git)flow ASAP.

## Issues!

Its all about issues, every change must have a reference issue in which the dev team can debate about, and branches that name the user and issue it's working on.

So if you need to do a change, fix something or add a new feature, please open an issue or feature for it. Once you have a issue number to work with, create a branch from latest `develop` in YOUR own fork and name it `user_t#_short_description_of_issue` see [here](https://github.com/stdevPavelmc/MystiQ/tree/stdevPavelmc_t8_travis_integration) where I created a branch named `stdevPavelmc_t8_travis_integration`

## Commits

All commits comments must start with `Refs #8, ....` where in this case the #8 refers to the issue you are working on, why? see it [here in action](https://github.com/llamaret/MystiQ/issues/8)

Hover the mouse over the name, number and comments of the commit `d4a19cd` github does a great job by linking all together, this is possible because we mentiones the issue in the branch name and also in the commit comment.

## Pull request

Pull request are intentions to merge some code into the main tree, you can open a pull request of your local work at any time, the only condition is that you have pushed at least a commit for an issue.

In fact is a recommended practice, open an issue, analyze, make your first commit and open the pull request ride away; in this way changes will be picked by travis and CI/CD will fire to tell you if your changes are good o broke something.

**As a general rule a pulll request must end with a comment on which you mentions @llamaret and estate that the pull request is ready to merge**

The merge action by the repo owner (@llamaret) will automatically close the corresponding pull request and the issue just by adding a comment like this to the comment of the merge `Closing issue #8...` github will do the magic and will (if travis build is a success) close the PR and the matching issue, all in just one place.

## Travis

This repo has travis-ci as CI/CD engine, see [https://travis-ci.org/llamaret/MystiQ](https://travis-ci.org/llamaret/MystiQ) to check the status and latest tests.

Travis is configured to use your email for notifications of success/fail on the build you triggers, in the near future we will implements github & travis notifications to the Telegram channel (pending Issue for this)

## Deploys

Automatic deploys to github are in the plan for tomorrow (aka ASAP) and will cover at least builds for the following distros:

- Ubuntu Bionic (works on Debian 9/10)
- Windows

In all cases we will try to use 32/64 bits if possible.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Requires:
- Qt5 >= 5.9
- Qt5 >= 5.10
- ffmpeg >= 1.1.0

BuildRequires:
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ other formats. MystiQ features an intuitive graphical interface and a rich set
of presets to help you convert media files within a few clicks. Advanced users
can also adjust conversion parameters in detail.

For compiling and installing MystiQ, please refer to INSTALL.txt.
For compiling and installing MystiQ, please refer to [INSTALL.txt](INSTALL.txt).

If you want to contribute as a developer please see the file [Developer_process.md](Developer_process.md).

License
-------
Expand Down
16 changes: 8 additions & 8 deletions constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
<!-- progressbar of the conversion list -->
<ProgressBar>
<Colors>
<Margin type="color">#83b0ef</Margin>
<Center type="color">#2c72c7</Center>
<Border type="color">#2a2f3b11</Border>
<Margin type="color">#556180</Margin>
<Center type="color">#55618f</Center>
<Border type="color">#fefefe</Border>
<Text type="color">#000000</Text>
<Background type="color">##4b536801</Background>
<Background type="color">#fafafa</Background>
</Colors>
</ProgressBar>

Expand All @@ -87,10 +87,10 @@
<InnerBorder type="color">#FAFAFA</InnerBorder>
</Container>
<Range>
<BackgroundGradient1 type="color">#8ebbff</BackgroundGradient1>
<BackgroundGradient2 type="color">#019aed</BackgroundGradient2>
<OuterBorder type="color">#3983ed</OuterBorder>
<InnerBorder type="color">#3c8dfd</InnerBorder>
<BackgroundGradient1 type="color">#55618f</BackgroundGradient1>
<BackgroundGradient2 type="color">#556180</BackgroundGradient2>
<OuterBorder type="color">#556180</OuterBorder>
<InnerBorder type="color">#55618f</InnerBorder>
</Range>
</Colors>
</RangeSelector>
Expand Down
Loading

0 comments on commit 1386732

Please sign in to comment.