From 9b8dbcecfbab7e7492e05f5e0ae22a2631335718 Mon Sep 17 00:00:00 2001 From: Parnassius Date: Mon, 1 Apr 2024 21:00:53 +0200 Subject: [PATCH 1/5] Sort profiles in the Backup Now tray menu (#1899) The profile list in the main window is already sorted by name (alphabetically, case-sensitive). However the profile list in the *Backup Now* action found in the tray menu wasn't. This commit constructs the sql query to return the profiles in order. * src/vorta/tray_menu.py --- src/vorta/tray_menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vorta/tray_menu.py b/src/vorta/tray_menu.py index e5a154d6..b9d5ac74 100644 --- a/src/vorta/tray_menu.py +++ b/src/vorta/tray_menu.py @@ -59,7 +59,7 @@ def build_menu(self): cancel_action.triggered.connect(self.app.backup_cancelled_event.emit) else: status.setText(self.tr('Next Task: %s') % next_task_time) - profiles = BackupProfileModel.select() + profiles = BackupProfileModel.select().order_by(BackupProfileModel.name) if profiles.count() > 1: profile_menu = menu.addMenu(self.tr('Backup Now')) for profile in profiles: From 58137f004d72e60d6fb091036d8b2dddfdb421de Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 Apr 2024 03:05:31 +0530 Subject: [PATCH 2/5] Add new exclusion presets (#1970) --- src/vorta/assets/exclusion_presets/dev.json | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/vorta/assets/exclusion_presets/dev.json b/src/vorta/assets/exclusion_presets/dev.json index bf53fb5b..91fe6969 100644 --- a/src/vorta/assets/exclusion_presets/dev.json +++ b/src/vorta/assets/exclusion_presets/dev.json @@ -56,5 +56,44 @@ ], "tags": ["type:dev", "editor:android-studio", "os:linux"], "author": "shivansh02" + }, + { + "name": "Jetbrains IDEs cache, config, path and logs", + "slug": "jetbrains", + "patterns": [ + "fm:*/.config/JetBrains", + "fm:*/.cache/JetBrains", + "fm:*/.local/share/JetBrains" + ], + "tags": ["type:dev", "editor:jetbrains", "os:linux"], + "author": "SAMAD101" + }, + { + "name": "AWS artefacts", + "slug": "aws-artefacts", + "patterns": [ + "fm:*/.aws" + ], + "tags": ["type:dev", "cloud:aws", "os:linux", "os:darwin"], + "author": "SAMAD101" + }, + { + "name": "Spotify cache and config files", + "slug": "spotify", + "patterns": [ + "fm:*/.cache/spotify", + "fm:*/.config/spotify" + ], + "tags": ["type:media", "media:spotify", "os:linux"], + "author": "SAMAD101" + }, + { + "name": "Docker artefacts", + "slug": "docker-artefacts", + "patterns": [ + "fm:*/.docker" + ], + "tags": ["type:dev", "cloud:docker", "os:linux", "os:darwin"], + "author": "SAMAD101" } ] From 7642002573e763afd8e9375dbb54e0c2d00d669d Mon Sep 17 00:00:00 2001 From: Manu Date: Sun, 7 Apr 2024 08:40:45 +0100 Subject: [PATCH 3/5] Fix stalebot config --- .github/{ => workflows}/stale.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename .github/{ => workflows}/stale.yml (90%) diff --git a/.github/stale.yml b/.github/workflows/stale.yml similarity index 90% rename from .github/stale.yml rename to .github/workflows/stale.yml index 150275de..fb587912 100644 --- a/.github/stale.yml +++ b/.github/workflows/stale.yml @@ -6,10 +6,13 @@ on: jobs: stale: runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write steps: - uses: actions/stale@v8 with: - days-before-issue-stale: 60 + days-before-issue-stale: 90 days-before-pr-stale: -1 days-before-issue-close: 7 # days-before-pr-close: 10 From 3268bf1599d533ea59145c8e7328dfe143af03f8 Mon Sep 17 00:00:00 2001 From: Aryaman Sharma <72215253+TheLazron@users.noreply.github.com> Date: Sun, 7 Apr 2024 22:35:04 +0530 Subject: [PATCH 4/5] Notify after post_backup_tasks. By @TheLazron (#1940) --- src/vorta/scheduler.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vorta/scheduler.py b/src/vorta/scheduler.py index aa8b2859..82f4f0a9 100644 --- a/src/vorta/scheduler.py +++ b/src/vorta/scheduler.py @@ -459,6 +459,7 @@ def post_backup_tasks(self, profile_id): Pruning and checking after successful backup. """ profile = BackupProfileModel.get(id=profile_id) + notifier = VortaNotifications.pick() logger.info('Doing post-backup jobs for %s', profile.name) if profile.prune_on: msg = BorgPruneJob.prepare(profile) @@ -489,6 +490,11 @@ def post_backup_tasks(self, profile_id): self.app.jobs_manager.add_job(job) logger.info('Finished background task for profile %s', profile.name) + notifier.deliver( + self.tr('Vorta Backup'), + self.tr('Post Backup Tasks successful for %s' % profile.name), + level='info', + ) def remove_job(self, profile_id): if profile_id in self.timers: From 9cabbbd193c908361f8aebab08df42c413c01a34 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 8 Apr 2024 16:24:31 +0100 Subject: [PATCH 5/5] Input to change macOS version for building --- .github/workflows/build-macos.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 795d1548..962be092 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -3,17 +3,21 @@ on: workflow_dispatch: inputs: branch: - description: 'Branch to use for building macOS release' + description: 'Branch to use for building release' required: true default: 'master' borg_version: description: 'Borg version to package' required: true - default: '1.2.1' + default: '1.2.8' + macos_version: + description: 'macOS version for building' + required: true + default: 'macos-11' jobs: build: - runs-on: macos-11 + runs-on: ${{ github.event.inputs.macos_version }} steps: - name: Check out selected branch