ci: Synchronize with sdk-nrf

This commit is dedicated to checking synchronization between
ncs-matter and the newest sdk-nrf and sdk-connectedhomeip.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

.github/workflows/sdk-sync.yml

@@ -0,0 +1,62 @@
+name: SDK Sync
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+  push:
+    branches:
+      - sdk-nrf
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  sdk-sync:
+    runs-on: ubuntu-24.04
+    env:
+      SDK_SYNC_PAT: ${{ secrets.SDK_SYNC_PAT }}
+      GH_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Set state file path
+        run: echo "STATE_FILE=${RUNNER_TEMP}/sdk_sync_state.json" >> "$GITHUB_ENV"
+
+      - name: Set up Python
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
+        with:
+          python-version: '3.12'
+          cache: pip
+          cache-dependency-path: scripts/sdk_sync/requirements.txt
+
+      - name: Install dependencies
+        run: pip install -r scripts/sdk_sync/requirements.txt
+
+      - name: Configure git credentials
+        run: |
+          git remote set-url origin "https://x-access-token:${SDK_SYNC_PAT}@github.com/${{ github.repository }}.git"
+          git config --global user.email "sdk-sync-bot@users.noreply.github.com"
+          git config --global user.name "sdk-sync-bot"
+
+      - name: Rebase sdk-nrf onto main
+        run: python scripts/sdk_sync/rebase_branch.py
+
+      - name: Prepare test PR branch
+        run: python scripts/sdk_sync/prepare_pr.py --state-file "${STATE_FILE}"
+
+      - name: Collect upstream revision report
+        run: python scripts/sdk_sync/chip_sync_report.py --state-file "${STATE_FILE}"
+
+      - name: Update west.yml on PR branch
+        run: |
+          git checkout sdk-sync/test
+          python scripts/sdk_sync/update_manifest.py --state-file "${STATE_FILE}" --branch sdk-sync/test
+
+      - name: Post sync summary comment
+        run: python scripts/sdk_sync/build_report.py --state-file "${STATE_FILE}"

scripts/sdk_sync/__init__.py

@@ -0,0 +1,4 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+"""Scripts for weekly sdk-nrf / sdk-connectedhomeip synchronization."""

scripts/sdk_sync/build_report.py

@@ -0,0 +1,167 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+"""Build and post the sdk-sync summary comment on the test PR."""
+
+from __future__ import annotations
+
+import argparse
+import os
+import sys
+from datetime import datetime, timezone
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+if str(SCRIPT_DIR) not in sys.path:
+    sys.path.insert(0, str(SCRIPT_DIR))
+
+from common import (  # noqa: E402
+    FROM_NRF_MARKER,
+    REPORT_MARKER,
+    ChipSyncReport,
+    SyncState,
+    github_get,
+    github_get_paginated,
+    github_headers,
+    github_token,
+    read_json,
+    short_sha,
+    within_last_days,
+)
+
+import requests
+
+NRF_REPO = "nrfconnect/sdk-nrf"
+CHIP_REPO = "nrfconnect/sdk-connectedhomeip"
+
+
+def recent_pull_requests(*, repo: str, days: int) -> list[dict]:
+    pulls = github_get_paginated(
+        f"/repos/{repo}/pulls",
+        params={"state": "all", "sort": "updated", "direction": "desc", "per_page": 100},
+    )
+    recent = []
+    for pull in pulls:
+        if within_last_days(pull.get("updated_at"), days) or within_last_days(pull.get("merged_at"), days):
+            recent.append(pull)
+    return recent
+
+
+def render_pr_list(pulls: list[dict]) -> str:
+    if not pulls:
+        return "_No pull requests updated in the last 7 days._\n"
+    lines = []
+    for pull in pulls:
+        number = pull["number"]
+        title = pull["title"].replace("\n", " ")
+        url = pull["html_url"]
+        state = pull.get("state", "unknown")
+        lines.append(f"- [#{number} {title}]({url}) ({state})")
+    return "\n".join(lines) + "\n"
+
+
+def render_commit_list(commits: list[dict]) -> str:
+    if not commits:
+        return "_None._\n"
+    lines = []
+    for commit in commits:
+        lines.append(f"- [{commit['subject']}]({commit['html_url']}) (`{short_sha(commit['sha'])}`)")
+    return "\n".join(lines) + "\n"
+
+
+def build_report_body(*, state: SyncState, days: int) -> str:
+    now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M UTC")
+    chip = state.chip_sync
+    nrf_prs = recent_pull_requests(repo=NRF_REPO, days=days)
+    chip_prs = recent_pull_requests(repo=CHIP_REPO, days=days)
+
+    body = f"""{REPORT_MARKER}
+## Weekly SDK sync report
+
+Generated: {now}
+
+### Manifest revisions under test
+
+| Project | Revision |
+|---------|----------|
+| `sdk-nrf` (`nrf`) | `{state.nrf_sha}` |
+| `sdk-connectedhomeip` (`matter`, `sdk-nrf` branch) | `{state.matter_sha}` |
+
+<details>
+<summary>sdk-nrf pull requests (last {days} days)</summary>
+
+{render_pr_list(nrf_prs)}
+</details>
+
+<details>
+<summary>sdk-connectedhomeip pull requests (last {days} days)</summary>
+
+{render_pr_list(chip_prs)}
+</details>
+
+<details>
+<summary>sdk-connectedhomeip commits above merge-base ({len(chip.commits_above_anchor)})</summary>
+
+{render_commit_list([c.__dict__ for c in chip.commits_above_anchor])}
+</details>
+
+<details>
+<summary>Commits missing {FROM_NRF_MARKER} ({len(chip.commits_missing_from_nrf)})</summary>
+
+{render_commit_list([c.__dict__ for c in chip.commits_missing_from_nrf])}
+</details>
+"""
+    return body
+
+
+def find_existing_comment(*, repo: str, pr_number: int) -> int | None:
+    comments = github_get_paginated(f"/repos/{repo}/issues/{pr_number}/comments")
+    for comment in comments:
+        if REPORT_MARKER in comment.get("body", ""):
+            return int(comment["id"])
+    return None
+
+
+def upsert_pr_comment(*, repo: str, pr_number: int, body: str) -> None:
+    existing_id = find_existing_comment(repo=repo, pr_number=pr_number)
+    headers = github_headers()
+    if existing_id is not None:
+        response = requests.patch(
+            f"https://api.github.com/repos/{repo}/issues/comments/{existing_id}",
+            headers=headers,
+            json={"body": body},
+            timeout=60,
+        )
+        action = "Updated"
+    else:
+        response = requests.post(
+            f"https://api.github.com/repos/{repo}/issues/{pr_number}/comments",
+            headers=headers,
+            json={"body": body},
+            timeout=60,
+        )
+        action = "Posted"
+    if response.status_code >= 400:
+        sys.exit(f"Failed to comment on PR #{pr_number}: {response.status_code} {response.text}")
+    print(f"{action} report comment on PR #{pr_number}")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--repo", default=os.environ.get("GITHUB_REPOSITORY", "nrfconnect/ncs-matter"))
+    parser.add_argument("--state-file", type=Path, required=True)
+    parser.add_argument("--days", type=int, default=7)
+    args = parser.parse_args()
+
+    _ = github_token()
+    raw = read_json(args.state_file)
+    if "pr_number" not in raw:
+        sys.exit("state file is missing pr_number; run prepare_pr.py first")
+
+    state = SyncState.from_dict(raw)
+    body = build_report_body(state=state, days=args.days)
+    upsert_pr_comment(repo=args.repo, pr_number=state.pr_number, body=body)
+
+
+if __name__ == "__main__":
+    main()

scripts/sdk_sync/chip_sync_report.py

@@ -0,0 +1,104 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+"""Compare sdk-connectedhomeip master and sdk-nrf branches."""
+
+from __future__ import annotations
+
+import argparse
+import sys
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+if str(SCRIPT_DIR) not in sys.path:
+    sys.path.insert(0, str(SCRIPT_DIR))
+
+from common import (  # noqa: E402
+    FROM_NRF_MARKER,
+    ChipSyncReport,
+    CommitInfo,
+    github_get,
+    read_json,
+    write_json,
+)
+
+CHIP_REPO = "nrfconnect/sdk-connectedhomeip"
+NRF_REPO = "nrfconnect/sdk-nrf"
+
+
+def branch_tip(*, repo: str, branch: str) -> str:
+    ref = github_get(f"/repos/{repo}/git/ref/heads/{branch}")
+    return ref["object"]["sha"]
+
+
+def merge_base(*, repo: str, base: str, head: str) -> str:
+    comparison = github_get(f"/repos/{repo}/compare/{base}...{head}")
+    return comparison["merge_base_commit"]["sha"]
+
+
+def commits_on_branch(*, repo: str, branch: str, since_sha: str) -> list[CommitInfo]:
+    comparison = github_get(f"/repos/{repo}/compare/{since_sha}...{branch}")
+    commits: list[CommitInfo] = []
+    for commit in comparison.get("commits", []):
+        subject = commit["commit"]["message"].splitlines()[0]
+        commits.append(
+            CommitInfo(
+                sha=commit["sha"],
+                subject=subject,
+                html_url=commit["html_url"],
+                has_from_nrf=FROM_NRF_MARKER in subject,
+            )
+        )
+    return commits
+
+
+def build_chip_sync_report(*, chip_repo: str = CHIP_REPO) -> ChipSyncReport:
+    master_sha = branch_tip(repo=chip_repo, branch="master")
+    sdk_nrf_sha = branch_tip(repo=chip_repo, branch="sdk-nrf")
+    anchor_sha = merge_base(repo=chip_repo, base="master", head="sdk-nrf")
+    above_anchor = commits_on_branch(repo=chip_repo, branch="sdk-nrf", since_sha=anchor_sha)
+    missing = [commit for commit in above_anchor if not commit.has_from_nrf]
+    return ChipSyncReport(
+        master_sha=master_sha,
+        sdk_nrf_branch_sha=sdk_nrf_sha,
+        merge_base_sha=anchor_sha,
+        commits_above_anchor=above_anchor,
+        commits_missing_from_nrf=missing,
+    )
+
+
+def nrf_main_branch_sha(*, nrf_repo: str = NRF_REPO, branch: str = "main") -> str:
+    return branch_tip(repo=nrf_repo, branch=branch)
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--chip-repo", default=CHIP_REPO)
+    parser.add_argument("--nrf-repo", default=NRF_REPO)
+    parser.add_argument("--nrf-branch", default="main")
+    parser.add_argument("--state-file", type=Path, required=True)
+    args = parser.parse_args()
+
+    chip_report = build_chip_sync_report(chip_repo=args.chip_repo)
+    nrf_sha = nrf_main_branch_sha(nrf_repo=args.nrf_repo, branch=args.nrf_branch)
+
+    if args.state_file.exists():
+        state = read_json(args.state_file)
+    else:
+        state = {}
+
+    state["chip_sync"] = chip_report.to_dict()
+    state["matter_sha"] = chip_report.sdk_nrf_branch_sha
+    state["nrf_sha"] = nrf_sha
+    write_json(args.state_file, state)
+
+    print(f"sdk-connectedhomeip master: {chip_report.master_sha}")
+    print(f"sdk-connectedhomeip sdk-nrf: {chip_report.sdk_nrf_branch_sha}")
+    print(f"merge-base anchor: {chip_report.merge_base_sha}")
+    print(f"commits above anchor: {len(chip_report.commits_above_anchor)}")
+    print(f"commits missing {FROM_NRF_MARKER}: {len(chip_report.commits_missing_from_nrf)}")
+    print(f"sdk-nrf {args.nrf_branch}: {nrf_sha}")
+
+
+if __name__ == "__main__":
+    main()