From fedb4d9c2294362f6abea8360d0682d40daa632a Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Sun, 8 Dec 2024 09:18:27 +0000 Subject: [PATCH 1/3] profiles: Check whether profile is running Instead of erroring, confirm whether the profile is running, if it isn't it is safe to delete to file and start a new profile. Signed-off-by: Paulo Gomes --- internal/profiles/profiles.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go index 8f6bbd6..7309d14 100644 --- a/internal/profiles/profiles.go +++ b/internal/profiles/profiles.go @@ -86,10 +86,10 @@ func StartFromGit(runner, name, gitURL, path, local string) error { ln := files.ProfileConfig(name) if _, err := os.Lstat(ln); err == nil { - // Wayland is not cleaning up profile state after closure. - if !strings.EqualFold(os.Getenv("XDG_SESSION_TYPE"), "wayland") { + if container.Running(runner, fmt.Sprintf(ContainerNameFormat, name)) { return fmt.Errorf("profile %q is already started", name) } + if err = os.Remove(ln); err != nil { return fmt.Errorf("failed to remove leftover profile symlink: %w", err) } From 24d45f216aab76a96d8930b9f71a0c04c1d6ccd4 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Sun, 8 Dec 2024 09:20:54 +0000 Subject: [PATCH 2/3] build: Group dependabot updates Signed-off-by: Paulo Gomes --- .github/dependabot.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index d6b242f..4b911a1 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -4,8 +4,16 @@ updates: directory: "/" schedule: interval: "weekly" + groups: + golang.org: + patterns: + - "golang.org/*" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "monthly" + groups: + github-actions-updates: + patterns: + - "*" From 6fce34dba49096686ebb5011751b0eb51216e624 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Sun, 8 Dec 2024 09:27:40 +0000 Subject: [PATCH 3/3] obs: Remove rebuild process Signed-off-by: Paulo Gomes --- .obs/workflows.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.obs/workflows.yml b/.obs/workflows.yml index ee0ca06..490ed9d 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -18,17 +18,3 @@ testbuild: - aarch64 filters: event: pull_request - -rebuild: - steps: - - trigger_services: - project: home:pjbgf:devel:languages:go:unstable - package: qubesome - - rebuild_package: - project: home:pjbgf:devel:languages:go:unstable - package: qubesome - filters: - event: push - branches: - only: - - main