Merge branch 'main' into unlink-release-download-pages

Author: ebembi-crdb

.github/scripts/validate_branch_existence.py

@@ -40,6 +40,7 @@
 GENERATED_DIAGRAMS_REPO = "cockroachdb/generated-diagrams"
 GITHUB_API_BASE = "https://api.github.com"
 VERSIONS_CSV = Path("src/current/_data/versions.csv")
+DOCS_ROOT = Path("src/current")
 
 # ---------------------------------------------------------------------------
 # HTTP
@@ -69,6 +70,17 @@ def _api_get(path: str) -> dict | None:
 # Core logic
 # ---------------------------------------------------------------------------
 
+def has_docs_folder(version: str) -> bool:
+    """Return True if a docs folder exists for this version.
+
+    Handles both naming conventions: v20_1 (underscore) and v23.1 (dot).
+    """
+    ver = version.lstrip("v")
+    dot_form = DOCS_ROOT / f"v{ver}"
+    underscore_form = DOCS_ROOT / f"v{ver.replace('.', '_')}"
+    return dot_form.is_dir() or underscore_form.is_dir()
+
+
 _cache: dict[str, bool] = {}
 
 
@@ -88,13 +100,16 @@ def load_versions_csv() -> list[dict]:
         return list(csv.DictReader(f))
 
 
-def run_checks(rows: list[dict], _exists_fn=None) -> list[dict]:
+def run_checks(rows: list[dict], _exists_fn=None, _has_docs_fn=None) -> list[dict]:
     """Check each versions.csv row for branch existence and staleness.
 
     _exists_fn is injectable for unit tests; defaults to branch_exists.
+    _has_docs_fn is injectable for unit tests; defaults to has_docs_folder.
     """
     if _exists_fn is None:
         _exists_fn = branch_exists
+    if _has_docs_fn is None:
+        _has_docs_fn = has_docs_folder
 
     failures = []
     checked: set[str] = set()
@@ -105,6 +120,11 @@ def run_checks(rows: list[dict], _exists_fn=None) -> list[dict]:
         if not branch or branch == "N/A":
             continue
 
+        # Skip versions that have been archived from the site.
+        if not _has_docs_fn(version):
+            print(f"  {version:8s} → {branch} ... SKIP (archived)")
+            continue
+
         # (a) Does the listed branch exist?
         if branch not in checked:
             checked.add(branch)
@@ -179,9 +199,11 @@ def format_comment(failures: list[dict]) -> str:
 def _run_self_tests() -> None:
     """Unit tests for run_checks logic using injected exists functions."""
 
-    def _quiet(rows, exists_fn):
+    _no_call = lambda b: (_ for _ in ()).throw(AssertionError("unexpected call"))
+
+    def _quiet(rows, exists_fn, has_docs_fn=lambda v: True):
         with contextlib.redirect_stdout(io.StringIO()):
-            return run_checks(rows, _exists_fn=exists_fn)
+            return run_checks(rows, _exists_fn=exists_fn, _has_docs_fn=has_docs_fn)
 
     # branch_missing: listed branch does not exist
     rows = [{"major_version": "v26.1", "crdb_branch_name": "release-26.1"}]
@@ -204,14 +226,25 @@ def _quiet(rows, exists_fn):
 
     # N/A entries are skipped entirely
     rows = [{"major_version": "v24.1", "crdb_branch_name": "N/A"}]
-    failures = _quiet(rows, lambda b: (_ for _ in ()).throw(AssertionError("unexpected call")))
+    failures = _quiet(rows, _no_call)
     assert failures == [], failures
 
     # empty branch field is skipped
     rows = [{"major_version": "v25.1", "crdb_branch_name": ""}]
-    failures = _quiet(rows, lambda b: (_ for _ in ()).throw(AssertionError("unexpected call")))
+    failures = _quiet(rows, _no_call)
     assert failures == [], failures
 
+    # archived versions (no docs folder) are skipped
+    rows = [{"major_version": "v1.0", "crdb_branch_name": "release-1.0"}]
+    failures = _quiet(rows, _no_call, has_docs_fn=lambda v: False)
+    assert failures == [], failures
+
+    # non-archived version with missing branch still fails
+    rows = [{"major_version": "v26.1", "crdb_branch_name": "release-26.1"}]
+    failures = _quiet(rows, lambda b: False, has_docs_fn=lambda v: True)
+    assert len(failures) == 1, failures
+    assert failures[0]["type"] == "branch_missing", failures
+
     print("All self-tests passed.")
     sys.exit(0)
 

.github/workflows/slack-notify-doc-review.yml

@@ -0,0 +1,32 @@
+name: Notify Slack on Doc Review Request
+
+on:
+  pull_request:
+    types: [review_requested]
+
+jobs:
+  notify-slack:
+    # Only run if docs-prs team was requested as reviewer
+    if: github.event.requested_team.slug == 'docs-prs'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Slack notification
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DOC_REVIEW_WEBHOOK_URL }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          LINES_CHANGED: ${{ github.event.pull_request.additions + github.event.pull_request.deletions }}
+        run: |
+          jq -n \
+            --arg title "$PR_TITLE" \
+            --arg url "$PR_URL" \
+            --arg author "$PR_AUTHOR" \
+            --arg number "$PR_NUMBER" \
+            --arg lines "$LINES_CHANGED" \
+            '{pr_title: $title, pr_url: $url, pr_author: $author, pr_number: $number, lines_changed: $lines}' \
+          | curl -X POST "$SLACK_WEBHOOK_URL" \
+            -H 'Content-Type: application/json' \
+            --fail-with-body \
+            -d @-

src/current/_data/releases.yml

@@ -11397,12 +11397,6 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v26.2.0-rc.1
-  cloud_only: true
-  cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
-  cloud_only_message: >
-    This version is currently available only for select
-    CockroachDB Cloud clusters. Binaries for self-hosted clusters will be available
-    approximately 2 weeks after Cloud availability.
 
 
 - release_name: v26.1.4
@@ -11543,3 +11537,66 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v24.1.28
+
+
+- release_name: v26.2.1
+  major_version: v26.2
+  release_date: '2026-05-22'
+  release_type: Production
+  go_version: go1.26.2
+  sha: b398a6e1fde74a915daf8e9841303c8ee39c2abe
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v26.2.0
+  cloud_only: true
+  cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
+  cloud_only_message: >
+      This version is currently available only for select
+      CockroachDB Cloud clusters. To request to upgrade
+      a CockroachDB self-hosted cluster to this version,
+      [contact support](https://support.cockroachlabs.com/hc/requests/new).
+
+
+- release_name: v24.3.33
+  major_version: v24.3
+  release_date: '2026-05-25'
+  release_type: Production
+  go_version: go1.26.2
+  sha: 4553626be4d29aff5517b42da4113363d64bc030
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.3.32