Merge branch 'master' into update-geektool-cfg

lra · Nov 5, 2023 · c805de9 · c805de9
2 parents e734664 + b246382
commit c805de9
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
@@ -3,18 +3,34 @@ on: pull_request
 
 jobs:
 
-  install:
+  install-on-linux:
     strategy:
       matrix:
+        os:
+          - "ubuntu-20.04"
+          - "ubuntu-22.04"
         python-version:
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     container: python:${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - run: pip install .
+      - run: mackup --help
+
+  install-on-macos:
+    strategy:
+      matrix:
+        os:
+          - macos-11
+          - macos-12
+          - macos-13
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
       - run: pip install .
       - run: mackup --help
diff --git a/.github/workflows/linelint.yaml b/.github/workflows/linelint.yaml
@@ -11,6 +11,6 @@ jobs:
     name: Check if all files end with a newline character
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Linelint
         uses: fernandrone/linelint@master
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -10,5 +10,5 @@ jobs:
     container: python
     steps:
       - run: pip install black
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: black --check --target-version py310 .
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,7 +8,7 @@ jobs:
     container: python:2.7
     steps:
       - run: pip install docopt six nose
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup
 
   nose:
@@ -26,5 +26,5 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
       - run: pip install pipx
       - run: pipx install poetry
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: make test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## WIP
 
 - Updated support for GeekTool (via @yuchen-lea)
+- Remve support for Apple Preview, problematic on macOS 14.1
+
+## Mackup 0.8.39
+
 - Updated support for Factorio (via @jpuris)
 - Added support for Zed (via @sethherr)
 - Updated support for IntelliJIdea version 2023.1 and 2023.2

diff --git a/README.md b/README.md
@@ -438,7 +438,6 @@ See the [README](doc/README.md) file in the doc directory for more info.
 - [LunarVim](https://www.lunarvim.org/)
 - [MacDive](http://www.mac-dive.com/)
 - [MacDown](http://macdown.uranusjr.com/)
-- macOS Preview
 - [MacOSX](http://www.apple.com/osx/)
 - [MacVim](https://github.com/macvim-dev/macvim)
 - [Magic Launch](https://www.oneperiodic.com/products/magiclaunch/)

diff --git a/mackup/applications/preview.cfg b/mackup/applications/preview.cfg
diff --git a/mackup/constants.py b/mackup/constants.py
@@ -1,6 +1,6 @@
 """Constants used in Mackup."""
 # Current version
-VERSION = "0.8.38"
+VERSION = "0.8.39"
 
 # Support platforms
 PLATFORM_DARWIN = "Darwin"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mackup"
-version = "0.8.38"
+version = "0.8.39"
 description = "Keep your application settings in sync (macOS/Linux)"
 authors = ["Laurent Raufaste <[email protected]>"]
 license = "GPLv3"