From 09d70543cab0b3864c8a2d94212223eb116e74cb Mon Sep 17 00:00:00 2001 From: leogdion Date: Thu, 5 Feb 2026 10:33:46 -0500 Subject: [PATCH 1/3] Fix BushelCloud subrepo parent reference after rebase Update parent commit reference from 39a97cc to ded2340 to resolve git-subrepo sync point ancestry issue caused by previous rebase. Co-Authored-By: Claude Sonnet 4.5 Fix CelestraCloud subrepo parent reference after rebase Update parent commit reference from 72b6cb0 to 10cf451 to resolve git-subrepo sync point ancestry issue caused by previous rebase. Co-Authored-By: Claude Sonnet 4.5 Disable workflow on subrepo branches in BushelCloud Only run the bushel-cloud-build workflow on PRs targeting main branch. This prevents the workflow from failing on subrepo branches like 'mistkit' where the local MistKit path dependency is not available. Co-Authored-By: Claude Sonnet 4.5 --- Examples/BushelCloud/.github/workflows/bushel-cloud-build.yml | 4 +++- Examples/BushelCloud/.gitrepo | 2 +- Examples/CelestraCloud/.gitrepo | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Examples/BushelCloud/.github/workflows/bushel-cloud-build.yml b/Examples/BushelCloud/.github/workflows/bushel-cloud-build.yml index 50188355..0b55b893 100644 --- a/Examples/BushelCloud/.github/workflows/bushel-cloud-build.yml +++ b/Examples/BushelCloud/.github/workflows/bushel-cloud-build.yml @@ -9,8 +9,10 @@ on: # Allow manual trigger workflow_dispatch: - # Build on PRs for validation + # Build on PRs for validation (only PRs targeting main) pull_request: + branches: + - main # Prevent concurrent builds # Why cancel-in-progress? diff --git a/Examples/BushelCloud/.gitrepo b/Examples/BushelCloud/.gitrepo index 79deacb8..90647158 100644 --- a/Examples/BushelCloud/.gitrepo +++ b/Examples/BushelCloud/.gitrepo @@ -7,6 +7,6 @@ remote = git@github.com:brightdigit/BushelCloud.git branch = mistkit commit = d1343a63d9b5e654ac665c407d6ef563a6a70992 - parent = 39a97ccfd784ca65f38fd62ebbcfba8b876c6ae4 + parent = ded2340a737b9d84e024855f976c7d626bff5219 method = merge cmdver = 0.4.9 diff --git a/Examples/CelestraCloud/.gitrepo b/Examples/CelestraCloud/.gitrepo index ed99fc05..17b8b563 100644 --- a/Examples/CelestraCloud/.gitrepo +++ b/Examples/CelestraCloud/.gitrepo @@ -7,6 +7,6 @@ remote = git@github.com:brightdigit/CelestraCloud.git branch = mistkit commit = 319bc6208763c31706b9e10c3608d9f7cc5c2ef5 - parent = 72b6cb0efe09735817079569eb702104c18f905c + parent = 10cf4510ab393ad1b4277832fcd8441e32fe0b65 method = merge cmdver = 0.4.9 From 4551d96546ed2437e1e46b0ba1b89098200ea502 Mon Sep 17 00:00:00 2001 From: leogdion Date: Thu, 5 Feb 2026 10:35:00 -0500 Subject: [PATCH 2/3] git subrepo push Examples/BushelCloud subrepo: subdir: "Examples/BushelCloud" merged: "babafdb" upstream: origin: "git@github.com:brightdigit/BushelCloud.git" branch: "mistkit" commit: "babafdb" git-subrepo: version: "0.4.9" origin: "https://github.com/Homebrew/brew" commit: "2a48e23bc9" --- Examples/BushelCloud/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BushelCloud/.gitrepo b/Examples/BushelCloud/.gitrepo index 90647158..fdf0ec88 100644 --- a/Examples/BushelCloud/.gitrepo +++ b/Examples/BushelCloud/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:brightdigit/BushelCloud.git branch = mistkit - commit = d1343a63d9b5e654ac665c407d6ef563a6a70992 - parent = ded2340a737b9d84e024855f976c7d626bff5219 + commit = babafdb946de4ccb74c1c45ce14ca446c4e394b5 + parent = 09fe9809f10e06b9060833cbb7a74eefb6e0d1c6 method = merge cmdver = 0.4.9 From a55068f2360e887f4a5cd8704fb32c4c1342fc14 Mon Sep 17 00:00:00 2001 From: leogdion Date: Thu, 5 Feb 2026 11:55:02 -0500 Subject: [PATCH 3/3] git subrepo push Examples/BushelCloud subrepo: subdir: "Examples/BushelCloud" merged: "f13f869" upstream: origin: "git@github.com:brightdigit/BushelCloud.git" branch: "mistkit" commit: "f13f869" git-subrepo: version: "0.4.9" origin: "https://github.com/Homebrew/brew" commit: "2a48e23bc9" --- Examples/BushelCloud/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BushelCloud/.gitrepo b/Examples/BushelCloud/.gitrepo index fdf0ec88..e4c3c566 100644 --- a/Examples/BushelCloud/.gitrepo +++ b/Examples/BushelCloud/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:brightdigit/BushelCloud.git branch = mistkit - commit = babafdb946de4ccb74c1c45ce14ca446c4e394b5 - parent = 09fe9809f10e06b9060833cbb7a74eefb6e0d1c6 + commit = f13f8695a0ca4b041db1e775c239d6cc8b258fb2 + parent = 1ec3d15919adf827cd144f948fc31e822c60ab99 method = merge cmdver = 0.4.9