AX-1651 - Change script to update the version + change to version 5

Author: yanivt-jfrog

.github/plugins.json

@@ -1,7 +1,26 @@
 {
   "plugins": [
-    { "name": "claude-plugin", "dest_prefix": "" },
-    { "name": "cursor-plugin", "dest_prefix": "plugins/jfrog" },
-    { "name": "vscode-plugin", "dest_prefix": "plugin" }
+    {
+      "name": "claude-plugin",
+      "dest_prefix": "",
+      "version_bumps": [
+        { "file": ".claude-plugin/plugin.json", "path": "version" }
+      ]
+    },
+    {
+      "name": "cursor-plugin",
+      "dest_prefix": "plugins/jfrog",
+      "version_bumps": [
+        { "file": ".cursor-plugin/marketplace.json", "path": "metadata.version" },
+        { "file": "plugins/jfrog/.cursor-plugin/plugin.json", "path": "version" }
+      ]
+    },
+    {
+      "name": "vscode-plugin",
+      "dest_prefix": "plugin",
+      "version_bumps": [
+        { "file": "marketplace.json", "path": "plugins.0.version" }
+      ]
+    }
   ]
 }

.github/scripts/jfrog-sync-plugins.py

@@ -11,14 +11,15 @@
 import json
 import os
 import shutil
+import subprocess
 import sys
 from pathlib import Path
 
-PLUGINS_FILE = Path(".github/plugins.json")
-SOURCE = "skills"                # the directory under jfrog-skills we vendor into each plugin
-UPSTREAM_DIR = Path("upstream")  # sibling checkout of jfrog-skills@version (set by the workflow)
-PLUGIN_DIR = Path("plugin")      # sibling checkout of the target plugin repo (set by the workflow)
-USAGE = "usage: jfrog-sync-plugins.py matrix|copy"
+PLUGINS_FILE: Path = Path(".github/plugins.json")
+SOURCE: str = "skills"                # directory under jfrog-skills we vendor into each plugin
+UPSTREAM_DIR: Path = Path("upstream")  # sibling checkout of jfrog-skills@version (set by the workflow)
+PLUGIN_DIR: Path = Path("plugin")      # sibling checkout of the target plugin repo (set by the workflow)
+USAGE: str = "usage: jfrog-sync-plugins.py matrix|copy"
 
 
 def fail(msg: str) -> None:
@@ -29,25 +30,18 @@ def fail(msg: str) -> None:
 def create_matrix() -> None:
     """Emit a GitHub Actions matrix from .github/plugins.json.
 
-    Writes `matrix=<compact-json>` to $GITHUB_OUTPUT (the per-step output
-    file the runner provides automatically) and prints the matrix to
-    stdout for the run log.
+    Writes `matrix=<compact-json>` to $GITHUB_OUTPUT and prints it to stdout.
 
     Example input (.github/plugins.json):
-        {
-          "plugins": [
-            { "name": "claude-plugin", "dest_prefix": "" },
-            { "name": "cursor-plugin", "dest_prefix": "plugins/jfrog" }
-          ]
-        }
+        { "plugins": [{ "name": "claude-plugin", "dest_prefix": "" }] }
 
     Example output (appended to $GITHUB_OUTPUT):
-        matrix={"include":[{"name":"claude-plugin","dest_prefix":""},{"name":"cursor-plugin","dest_prefix":"plugins/jfrog"}]}
+        matrix={"include":[{"name":"claude-plugin","dest_prefix":""}]}
     """
-    data = json.loads(PLUGINS_FILE.read_text())
-    matrix = {"include": data["plugins"]}
+    data: dict = json.loads(PLUGINS_FILE.read_text())
+    matrix: dict = {"include": data["plugins"]}
 
-    output_file = os.environ.get("GITHUB_OUTPUT")
+    output_file: str | None = os.environ.get("GITHUB_OUTPUT")
     if output_file:
         with open(output_file, "a", encoding="utf-8") as f:
             f.write(f"matrix={json.dumps(matrix, separators=(',', ':'))}\n")
@@ -56,39 +50,77 @@ def create_matrix() -> None:
 
 
 def copy_skills_folder() -> None:
-    """Copy this repo's `skills/` into a plugin checkout at DEST_PREFIX.
-
-    Removes any existing destination first so the result matches upstream
-    exactly (no stale files left behind).
+    """Copy skills/ into the plugin at DEST_PREFIX, then bump each configured
+    version file in lock-step — but only if the copy actually produced changes.
 
     Required env:
-      DEST_PREFIX  Prefix inside the plugin, may be empty.
-
-    Example (cursor-plugin layout, DEST_PREFIX=plugins/jfrog):
-      copies upstream/skills -> plugin/plugins/jfrog/skills
+      DEST_PREFIX    Prefix inside the plugin, may be empty.
+                     e.g. "plugins/jfrog" -> skills/ lands at plugins/jfrog/skills/.
 
-    Example (claude-plugin layout, DEST_PREFIX=""):
-      copies upstream/skills -> plugin/skills
+    Optional env:
+      VERSION_BUMPS  JSON array of {file, path} entries.
+                     Each entry points to a JSON file inside the plugin and a
+                     dotted path to the semver field to patch-bump.
     """
-    # strip("/") tolerates "plugins/jfrog", "/plugins/jfrog/", and "" identically.
-    dest_prefix = os.environ.get("DEST_PREFIX", "").strip("/")
+    dest_prefix: str = os.environ.get("DEST_PREFIX", "").strip("/")
+    bumps: list[dict] = json.loads(os.environ.get("VERSION_BUMPS", "[]") or "[]")
 
-    src_path = UPSTREAM_DIR / SOURCE
-    if not src_path.exists():
-        fail(f"upstream missing {SOURCE}/ at {src_path}")
+    src: Path = UPSTREAM_DIR / SOURCE
+    if not src.exists():
+        fail(f"upstream missing {SOURCE}/ at {src}")
 
-    dest = PLUGIN_DIR / dest_prefix / SOURCE if dest_prefix else PLUGIN_DIR / SOURCE
+    dest: Path = PLUGIN_DIR / dest_prefix / SOURCE if dest_prefix else PLUGIN_DIR / SOURCE
     if dest.exists():
         shutil.rmtree(dest)
     dest.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copytree(src_path, dest)
-    print(f"Copied {src_path} -> {dest.relative_to(PLUGIN_DIR)}")
+    shutil.copytree(src, dest)
+    print(f"Copied {src} -> {dest.relative_to(PLUGIN_DIR)}")
+
+    if not bumps:
+        return
+    if not has_changes(PLUGIN_DIR):
+        print("No skill changes detected — skipping version bumps.")
+        return
+    for bump in bumps:
+        bump_patch_version(PLUGIN_DIR / bump["file"], bump["path"])
+
+
+def has_changes(repo_dir: Path) -> bool:
+    """Return True if `git status --porcelain` reports any working-tree changes."""
+    result = subprocess.run(
+        ["git", "status", "--porcelain"],
+        cwd=repo_dir,
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return bool(result.stdout.strip())
+
+
+def bump_patch_version(file_path: Path, dotted_path: str) -> None:
+    data: dict = json.loads(file_path.read_text())
+
+    # Convert numeric parts to int indices up front, e.g.
+    # "plugins.0.version" -> ["plugins", 0, "version"].
+    keys: list = [int(p) if p.isdigit() else p for p in dotted_path.split(".")]
+    parent = data
+    for key in keys[:-1]:
+        parent = parent[key]
+    leaf_key = keys[-1]
+
+    current: str = parent[leaf_key]
+    major, minor, patch = current.split(".")
+    new_version: str = f"{major}.{minor}.{int(patch) + 1}"
+    parent[leaf_key] = new_version
+
+    file_path.write_text(json.dumps(data, indent=2) + "\n")
+    print(f"Bumped {file_path.relative_to(PLUGIN_DIR)} {dotted_path}: {current} -> {new_version}")
 
 
 def main() -> None:
     # sys.argv[0] is the script path; sys.argv[1] is the first real argument.
     # We expect exactly one argument: either "matrix" or "copy".
-    command = sys.argv[1] if len(sys.argv) == 2 else ""
+    command: str = sys.argv[1] if len(sys.argv) == 2 else ""
 
     if command == "matrix":
         create_matrix()

.github/workflows/sync-plugins.yml

@@ -22,12 +22,12 @@ on:
 permissions:
   contents: read
 
-# TEMP: hardcoded to v0.10.0 for pre-merge testing — plugins are currently at v0.11.0,
-# so syncing v0.10.0 will produce a visible diff in the PRs. Revert to the line below
-# before merging:
+# TEMP: hardcoded to v0.5.0 for pre-merge testing — plugins are currently at v0.11.0,
+# so syncing v0.5.0 exercises additions, modifications, AND deletions (~12 files,
+# +434/-355) plus the patch-version bump. Revert to the line below before merging:
 #   VERSION: ${{ github.event.inputs.version || github.ref_name }}
 env:
-  VERSION: v0.10.0
+  VERSION: v0.5.0
 
 jobs:
   prepare:
@@ -64,6 +64,7 @@ jobs:
       - name: Copy skills into plugin
         env:
           DEST_PREFIX: ${{ matrix.dest_prefix }}
+          VERSION_BUMPS: ${{ toJson(matrix.version_bumps) }}
         run: python3 .github/scripts/jfrog-sync-plugins.py copy
 
       - uses: peter-evans/create-pull-request@v7