Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
lra authored Jun 6, 2020
2 parents c612203 + a8cc280 commit b07cf80
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 86 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Test installs
on:
- pull_request
- push

jobs:

install:
strategy:
matrix:
python-version:
- 2.7
- 3.6
- 3.7
- 3.8
runs-on: ubuntu-latest
container: python:${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
- run: python setup.py install
- run: mackup --help
14 changes: 14 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Lint Python
on:
- pull_request
- push

jobs:

black:
runs-on: ubuntu-latest
container: python
steps:
- run: pip install black
- uses: actions/checkout@v2
- run: black --check --target-version py27 .
86 changes: 0 additions & 86 deletions .github/workflows/mackup.yaml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/workflows/markdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Lint Markdown
on:
- pull_request
- push

jobs:

mdl:
runs-on: ubuntu-latest
container: rsrchboy/mdl
steps:
- uses: actions/checkout@v2
- run: mdl .
29 changes: 29 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Run tests
on:
- pull_request
- push

jobs:

nose-2_7:
runs-on: ubuntu-latest
container: python:2.7
steps:
- run: pip install docopt six nose
- uses: actions/checkout@v2
- run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup

nose:
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- 3.6
- 3.7
- 3.8
container: python:${{ matrix.python-version }}
steps:
- run: pip install pipenv
- uses: actions/checkout@v2
- run: pipenv install -d
- run: make test
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
- Added support for PyCharm 2020.1 (via @ameyuuno)
- Added support for Powerline (via @ho-oto)
- Added support for Yarn (via @dhb52)
- Add support for Quitter (via @guillaumealgis)

## Mackup 0.8.28

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ See the [README](doc/README.md) file in the doc directory for more info.
- [PyRadio](http://www.coderholic.com/pyradio/)
- [Querious](http://www.araelium.com/querious/)
- [Quicksilver](http://qsapp.com/)
- [Quitter](https://marco.org/apps)
- [Qutebrowser](http://qutebrowser.org/)
- [R](http://www.r-project.org/)
- [Rails](http://rubyonrails.org/)
Expand Down
3 changes: 3 additions & 0 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ fork Mackup and open a
[Pull Request](https://help.github.com/articles/using-pull-requests).
The stock application configs are in the `mackup/applications` directory.

Remember to follow the guidelines in [CONTRIBUTING.md](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md)
to get your Pull Request merged faster.

### Add support for an application or any file or directory

You can customize the Mackup engine and add support for unsupported
Expand Down
2 changes: 2 additions & 0 deletions mackup/applications/pycharm.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ Library/Application Support/PyCharm2019.2
Library/Application Support/PyCharm2019.3
.PyCharmCE2019.3/config
Library/Application Support/JetBrains/PyCharm2020.1
Library/Application Support/JetBrains/PyCharmCE2020.1
Library/Application Support/PyCharm
5 changes: 5 additions & 0 deletions mackup/applications/quitter.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[application]
name = Quitter

[configuration_files]
Library/Preferences/com.marcoarment.quitter.plist
3 changes: 3 additions & 0 deletions mackup/applications/tmux.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ name = Tmux

[configuration_files]
.tmux.conf

[xdg_configuration_files]
tmux/tmux.conf
2 changes: 2 additions & 0 deletions mackup/applications/webstorm.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = WebStorm

[configuration_files]
Library/Application Support/WebStorm
Library/Application Support/WebStorm8
Library/Preferences/WebStorm8
Library/Application Support/WebStorm9
Expand Down Expand Up @@ -40,3 +41,4 @@ Library/Application Support/WebStorm2020.2
Library/Preferences/WebStorm2020.2
Library/Application Support/WebStorm2020.3
Library/Preferences/WebStorm2020.3
Library/Application Support/JetBrains/WebStorm2020.1

0 comments on commit b07cf80

Please sign in to comment.