From 1b459118578d5af55e4ef3154bd2592b9685f74d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 26 Jan 2023 14:47:37 -0800 Subject: [PATCH 1/2] Omit hidden worktrees when showing projects in collaboration UI --- crates/collab/src/db.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index 0edd79e0e4..2b0e2ce9cf 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -1924,7 +1924,9 @@ impl Database { }; if let Some(db_worktree) = db_worktree { - project.worktree_root_names.push(db_worktree.root_name); + if db_worktree.visible { + project.worktree_root_names.push(db_worktree.root_name); + } } } } From f99e4043c478b9e9c4791b534a0f7778e66a5bd5 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 26 Jan 2023 14:55:06 -0800 Subject: [PATCH 2/2] Run CI for version branches but not all branches starting with 'v' --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fce5717ca9..b3268cc13c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - "v*" + - "v[0-9]+.[0-9]+.x" tags: - "v*" pull_request: