From 7893eb6cea477a2b0b8a09714083dd90860773ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Wed, 6 May 2026 11:06:49 +0200 Subject: [PATCH 1/2] fix: replace OWNERS.md references with CODEOWNERS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OWNERS.md was listed as a per-project requirement but is unspecified and redundant given GitHub CODEOWNERS handles all permission management. Remove all references and consolidate on CODEOWNERS as the single source of truth for project ownership and review authority. Signed-off-by: Jakob Möller On-behalf-of: @SAP --- .github/CODEOWNERS | 4 +--- CONTRIBUTING.md | 7 +++---- GOVERNANCE.md | 4 ++-- README.md | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ec4f6b1..0fb080e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,8 +5,6 @@ /.github/settings.yml @open-component-model/admins # Per-project entries are added here by the TSC after each project merges. -# OWNERS.md within each project remains TSC-controlled. # # Example (added post-merge for each approved project): -# /my-plugin/ @alice @bob -# /my-plugin/OWNERS.md @open-component-model/tsc \ No newline at end of file +# /my-plugin/ @alice @bob \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4e8a880..ea56554 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,6 @@ Projects live directly at the root of this repository: ``` / ├── README.md # Required: describe what the project does and why -├── OWNERS.md # Required: list at least one maintainer (GitHub handle) └── ... ``` @@ -27,15 +26,15 @@ Projects live directly at the root of this repository: A TSC member reviews the submission against the checklist: - Project scope is compatible with OCM -- `OWNERS.md` lists at least one maintainer willing to maintain the project +- CODEOWNERS entry lists at least one maintainer willing to maintain the project - No security or licensing concerns TSC approval is enforced natively via CODEOWNERS — at least one TSC member must approve the PR before it can merge. ### 4. Post-Merge -The TSC will add a CODEOWNERS entry for your project, granting you and any listed -co-maintainers review authority over `//`. +The TSC will add a CODEOWNERS entry for your project directory, granting you and any +listed co-maintainers review authority over `//`. ## Contributing to an Existing Project diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 77eed44..e488b88 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -40,8 +40,8 @@ The TSC conducts periodic health checks on active projects. Projects inactive fo Project-specific CODEOWNERS entries are added by the TSC after a project merges. Project owners have full autonomy over their top-level project directory but cannot -modify repository-wide CI workflows. The `OWNERS.md` file within each project remains -TSC-controlled to prevent unilateral privilege escalation. +modify repository-wide CI workflows. Changes to CODEOWNERS remain TSC-controlled +to prevent unilateral privilege escalation. ## Governance Evolution diff --git a/README.md b/README.md index 41d7711..9261d40 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ All projects here have been reviewed and approved by the **TSC** before merge. ## Projects Community projects live directly at the root of this repository. Each project is an -independent directory with its own `README.md` and `OWNERS.md`. +independent directory with its own `README.md`. ## Contributing a New Project From 11dd166475fbff595b52e18eb7614b68f6c44ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Wed, 6 May 2026 11:28:24 +0200 Subject: [PATCH 2/2] fix: require CODEOWNERS entry in project submission PR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Submitters must include their CODEOWNERS entry as part of the proposal PR rather than relying on TSC to add it post-merge. TSC still reviews and approves the entry before merge. Signed-off-by: Jakob Möller On-behalf-of: @SAP --- .github/CODEOWNERS | 5 +++-- CONTRIBUTING.md | 19 ++++++++++++------- GOVERNANCE.md | 9 +++++---- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0fb080e..8555325 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,7 +4,8 @@ # Repo settings — admins only /.github/settings.yml @open-component-model/admins -# Per-project entries are added here by the TSC after each project merges. +# Per-project entries are added by submitters as part of their project proposal PR. +# The TSC reviews and approves these entries before merge. # -# Example (added post-merge for each approved project): +# Example: # /my-plugin/ @alice @bob \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea56554..8a64a5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,12 +16,22 @@ Projects live directly at the root of this repository: └── ... ``` -### 2. Open a Pull Request +### 2. Add a CODEOWNERS entry + +Your submission PR **must** include a CODEOWNERS change that assigns at least one +maintainer to your project directory: + +``` +# In .github/CODEOWNERS — add at the end: +// @your-github-handle @optional-co-maintainer +``` + +### 3. Open a Pull Request - Title format: `feat: add ` ([Conventional Commits](https://www.conventionalcommits.org/)) - The workflow will automatically post a review checklist comment tagging `@open-component-model/tsc` -### 3. TSC Review +### 4. TSC Review A TSC member reviews the submission against the checklist: @@ -31,11 +41,6 @@ A TSC member reviews the submission against the checklist: TSC approval is enforced natively via CODEOWNERS — at least one TSC member must approve the PR before it can merge. -### 4. Post-Merge - -The TSC will add a CODEOWNERS entry for your project directory, granting you and any -listed co-maintainers review authority over `//`. - ## Contributing to an Existing Project Standard PR process — the TSC approval gate only activates when a new diff --git a/GOVERNANCE.md b/GOVERNANCE.md index e488b88..79446ed 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -38,10 +38,11 @@ The TSC conducts periodic health checks on active projects. Projects inactive fo ## Code Ownership -Project-specific CODEOWNERS entries are added by the TSC after a project merges. -Project owners have full autonomy over their top-level project directory but cannot -modify repository-wide CI workflows. Changes to CODEOWNERS remain TSC-controlled -to prevent unilateral privilege escalation. +Project submissions must include a CODEOWNERS entry assigning maintainers to the +project directory. The TSC reviews and approves these entries as part of the +submission PR. Project owners have full autonomy over their top-level project +directory but cannot modify repository-wide CI workflows. Changes to CODEOWNERS +remain TSC-controlled to prevent unilateral privilege escalation. ## Governance Evolution