Skip to content

Commit 21b761e

Browse files
fadymondyfadymondy
committed
Fix CI: scrub workspace go.sum entries including go.work.sum, keep non-workspace deps
- Scrub now covers go.work.sum in addition to go.sum files - Only removes entries for workspace modules (those in orchestra.lock), not all orchestra-mcp - Keeps non-workspace private modules (plugin-health, plugin-tools-prompts, etc.) intact - Restored plugin-health@v1.0.6 hash in go.work.sum
1 parent eef858d commit 21b761e

3 files changed

Lines changed: 64 additions & 19 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,18 @@ jobs:
5353
shell: bash
5454
run: |
5555
python3 << 'PYEOF'
56-
import glob
56+
import json, glob
5757
58-
# Remove ALL github.com/orchestra-mcp/* entries from go.sum and go.work.sum.
59-
# These modules are all workspace-local — resolved from cloned libs/ dirs.
60-
# Stale hashes cause SECURITY ERROR when tag content has changed.
61-
PREFIX = "github.com/orchestra-mcp/"
58+
# Collect workspace module paths (modules resolved locally via go.work).
59+
# Their go.sum entries may be stale when tags are force-pushed.
60+
# Non-workspace orchestra-mcp modules (e.g. plugin-health) must stay.
61+
lock = json.load(open("orchestra.lock"))
62+
workspace_mods = set()
63+
for pkg in lock["packages"]:
64+
if pkg["type"] == "proto":
65+
continue
66+
name = pkg["source"]["url"].replace("https://github.com/", "github.com/").replace(".git", "")
67+
workspace_mods.add(name)
6268
6369
sumfiles = list(glob.glob("**/go.sum", recursive=True)) + ["go.work.sum"]
6470
for sumfile in sumfiles:
@@ -68,10 +74,10 @@ jobs:
6874
continue
6975
if "/.git/" in sumfile:
7076
continue
71-
kept = [l for l in lines if not l.startswith(PREFIX)]
77+
kept = [l for l in lines if not any(l.startswith(m + " ") or l.startswith(m + "/") for m in workspace_mods)]
7278
if len(kept) != len(lines):
7379
open(sumfile, "w").writelines(kept)
74-
print(f" Scrubbed {len(lines)-len(kept)} orchestra-mcp entries from {sumfile}")
80+
print(f" Scrubbed {len(lines)-len(kept)} workspace entries from {sumfile}")
7581
PYEOF
7682
7783
- name: Generate go.work
@@ -137,9 +143,16 @@ jobs:
137143
shell: bash
138144
run: |
139145
python3 << 'PYEOF'
140-
import glob
146+
import json, glob
147+
148+
lock = json.load(open("orchestra.lock"))
149+
workspace_mods = set()
150+
for pkg in lock["packages"]:
151+
if pkg["type"] == "proto":
152+
continue
153+
name = pkg["source"]["url"].replace("https://github.com/", "github.com/").replace(".git", "")
154+
workspace_mods.add(name)
141155
142-
PREFIX = "github.com/orchestra-mcp/"
143156
sumfiles = list(glob.glob("**/go.sum", recursive=True)) + ["go.work.sum"]
144157
for sumfile in sumfiles:
145158
try:
@@ -148,10 +161,10 @@ jobs:
148161
continue
149162
if "/.git/" in sumfile:
150163
continue
151-
kept = [l for l in lines if not l.startswith(PREFIX)]
164+
kept = [l for l in lines if not any(l.startswith(m + " ") or l.startswith(m + "/") for m in workspace_mods)]
152165
if len(kept) != len(lines):
153166
open(sumfile, "w").writelines(kept)
154-
print(f" Scrubbed {len(lines)-len(kept)} orchestra-mcp entries from {sumfile}")
167+
print(f" Scrubbed {len(lines)-len(kept)} workspace entries from {sumfile}")
155168
PYEOF
156169
157170
- name: Generate go.work

‎.github/workflows/release.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,16 @@ jobs:
7373
shell: bash
7474
run: |
7575
python3 << 'PYEOF'
76-
import glob
76+
import json, glob
77+
78+
lock = json.load(open("orchestra.lock"))
79+
workspace_mods = set()
80+
for pkg in lock["packages"]:
81+
if pkg["type"] == "proto":
82+
continue
83+
name = pkg["source"]["url"].replace("https://github.com/", "github.com/").replace(".git", "")
84+
workspace_mods.add(name)
7785
78-
PREFIX = "github.com/orchestra-mcp/"
7986
sumfiles = list(glob.glob("**/go.sum", recursive=True)) + ["go.work.sum"]
8087
for sumfile in sumfiles:
8188
try:
@@ -84,10 +91,10 @@ jobs:
8491
continue
8592
if "/.git/" in sumfile:
8693
continue
87-
kept = [l for l in lines if not l.startswith(PREFIX)]
94+
kept = [l for l in lines if not any(l.startswith(m + " ") or l.startswith(m + "/") for m in workspace_mods)]
8895
if len(kept) != len(lines):
8996
open(sumfile, "w").writelines(kept)
90-
print(f" Scrubbed {len(lines)-len(kept)} orchestra-mcp entries from {sumfile}")
97+
print(f" Scrubbed {len(lines)-len(kept)} workspace entries from {sumfile}")
9198
PYEOF
9299
93100
- name: Generate go.work
@@ -227,9 +234,16 @@ jobs:
227234
shell: bash
228235
run: |
229236
python3 << 'PYEOF'
230-
import glob
237+
import json, glob
238+
239+
lock = json.load(open("orchestra.lock"))
240+
workspace_mods = set()
241+
for pkg in lock["packages"]:
242+
if pkg["type"] == "proto":
243+
continue
244+
name = pkg["source"]["url"].replace("https://github.com/", "github.com/").replace(".git", "")
245+
workspace_mods.add(name)
231246
232-
PREFIX = "github.com/orchestra-mcp/"
233247
sumfiles = list(glob.glob("**/go.sum", recursive=True)) + ["go.work.sum"]
234248
for sumfile in sumfiles:
235249
try:
@@ -238,10 +252,10 @@ jobs:
238252
continue
239253
if "/.git/" in sumfile:
240254
continue
241-
kept = [l for l in lines if not l.startswith(PREFIX)]
255+
kept = [l for l in lines if not any(l.startswith(m + " ") or l.startswith(m + "/") for m in workspace_mods)]
242256
if len(kept) != len(lines):
243257
open(sumfile, "w").writelines(kept)
244-
print(f" Scrubbed {len(lines)-len(kept)} orchestra-mcp entries from {sumfile}")
258+
print(f" Scrubbed {len(lines)-len(kept)} workspace entries from {sumfile}")
245259
PYEOF
246260
247261
- name: Generate go.work

‎go.work.sum‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,23 @@ github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKt
104104
github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
105105
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
106106
github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
107+
github.com/orchestra-mcp/plugin-bridge-claude v1.0.6/go.mod h1:yUMocbTLYUKWtjRceXw8LqV4d2SV83eet10wsT6EL5U=
108+
github.com/orchestra-mcp/plugin-devtools-api v1.0.6/go.mod h1:7sk0HFPaO3LoUy+xTO+pjVzQNIBvESPOt26d3ocbgUE=
109+
github.com/orchestra-mcp/plugin-devtools-database v1.0.6/go.mod h1:cdBkGthlQgji9l2ay8z7ptyHo1w70HOnbNMukAZnxZI=
110+
github.com/orchestra-mcp/plugin-devtools-ssh v1.0.6/go.mod h1:DMBiqp8CMk+/8AYPf1O4TSotqyJJewFuBBKnTawX9vE=
111+
github.com/orchestra-mcp/plugin-health v1.0.6/go.mod h1:xxSqyvTTzYvQuHGPE3hwqiqpz8lD1+W4o7sOC6VxjMg=
112+
github.com/orchestra-mcp/plugin-services-notifications v1.0.6/go.mod h1:M+4+0eLPeGAGahBt7hsGJbqerR+XQNo/F0Qd9Xlkqco=
113+
github.com/orchestra-mcp/plugin-services-voice v1.0.6/go.mod h1:eGlLt2NrtIMddrChBq/1OWTW9uIV4kMLz/D43vYTlYw=
114+
github.com/orchestra-mcp/plugin-storage-markdown v1.0.6/go.mod h1:VmTMhiWAeAzMf3IULONSG4otZgmjoT4XNkwfKhn0+To=
115+
github.com/orchestra-mcp/plugin-storage-sqlite v1.0.6/go.mod h1:Yo8ZeH38OSflEoE8+xKibLc8d833MjJVWI+VPUZRMrQ=
116+
github.com/orchestra-mcp/plugin-sync-cloud v1.0.6/go.mod h1:btbr2CgCrMzzKnA/5qxM7xwx2iJyXmnlYfTNkaovT0o=
117+
github.com/orchestra-mcp/plugin-tools-agentops v1.0.6/go.mod h1:zFPQInWCsylENgG/MUupQExvrduOJarsXYWE4LNC83g=
118+
github.com/orchestra-mcp/plugin-tools-docs v1.0.6/go.mod h1:Y47Ou0Un/tbbOlo48njUNGf5jehSphz07gm/slOfiA4=
119+
github.com/orchestra-mcp/plugin-tools-features v1.0.6/go.mod h1:mtlYoAui9kX8k0oSPeJ8V2wltL1XWVsj7BKPQBipas0=
120+
github.com/orchestra-mcp/plugin-tools-marketplace v1.0.6/go.mod h1:QIY8C+pbXzu3+spB9hPXgYe66ET8MEV9SKJZvN1aiQ0=
121+
github.com/orchestra-mcp/plugin-tools-notes v1.0.6/go.mod h1:xwZ7D+7NjEufjZFoPu46qlcgInJS6Y1tYq5Plxk9Kek=
122+
github.com/orchestra-mcp/plugin-tools-sessions v1.0.6/go.mod h1:mf7/O0dsNKMTphwRXV+f8HifUIbrsOA8fipi205sxZ8=
123+
github.com/orchestra-mcp/plugin-transport-stdio v1.0.6/go.mod h1:BKd1cLDdaNo4LuIMahxz6qhQzZVabpbe3zCTlV0WODU=
107124
github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
108125
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
109126
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
@@ -196,3 +213,4 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
196213
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
197214
howett.net/plist v1.0.2-0.20250314012144-ee69052608d9/go.mod h1:fyFX5Hj5tP1Mpk8obqA9MZgXT416Q5711SDT7dQLTLk=
198215
mvdan.cc/sh/v3 v3.12.0/go.mod h1:Se6Cj17eYSn+sNooLZiEUnNNmNxg0imoYlTu4CyaGyg=
216+
github.com/orchestra-mcp/plugin-health v1.0.6/go.mod h1:xxSqyvTTzYvQuHGPE3hwqiqpz8lD1+W4o7sOC6VxjMg=

0 commit comments

Comments
 (0)