From 966f01f8e86a8834cb5ed3a7f8a0d3a90d0f9622 Mon Sep 17 00:00:00 2001 From: "Ioannis L." <44038245+blitzcrieg1@users.noreply.github.com> Date: Mon, 16 Nov 2026 21:08:17 +0200 Subject: [PATCH] ci: remove the CLA bot, collect signatures by hand The CLA Assistant workflow used contributor-assistant/github-action, which is archived. On 2026-11-16 it failed at startup on four runs between 16:45 and 17:10, with the workflow file unchanged since 31 October, then passed again. It was a required check, so it blocked the 0.12.2 release PR until it was removed from branch protection. An archived action will not be fixed when it breaks for good. The CLA itself stays: CLA.md, CCLA.md and the five signatures on the cla-signatures branch are untouched. No outside pull request has arrived since September, so the maintainer asks for and records a signature by hand until that changes. CONTRIBUTING.md has the steps. Removing the workflow also drops the repository's only pull_request_target job with write permissions. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 4 +++- .github/workflows/cla.yml | 45 ----------------------------------- CLAUDE.md | 2 +- CONTRIBUTING.md | 26 +++++++++++++------- docs/legal/pre-cla-audit.md | 4 +++- signatures/version1/README.md | 15 +++++++----- 6 files changed, 33 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/cla.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 818915c2..49f764bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,9 @@ on: # orchestrator (windows-latest) # hooks-windows # dashboard -# CLAAssistant <- from cla.yml, not this file +# +# `CLAAssistant` was required until 2026-11-16, when its archived action stopped +# starting. The CLA is now signed by hand; see CONTRIBUTING.md. # # Deliberately NOT required: `supply-chain` here, and `analyze` in codeql.yml. # Both report on the world rather than on the diff, so a CVE published overnight diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml deleted file mode 100644 index 2d9aa250..00000000 --- a/.github/workflows/cla.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: "CLA Assistant" -on: - issue_comment: - types: [created] - pull_request_target: - types: [opened, closed, synchronize] - -# Nothing at the top level; the one job below asks for what it uses. The writes -# are real: signatures are committed to the cla-signatures branch, the bot -# comments on the PR, and the result is a commit status. Granting them to the -# whole workflow is what OpenSSF Scorecard's Token-Permissions check scores 0. -permissions: {} - -jobs: - CLAAssistant: - runs-on: ubuntu-latest - permissions: - actions: read - contents: write - pull-requests: write - statuses: write - steps: - - name: "CLA Assistant" - if: > - github.event_name == 'pull_request_target' || - ( - github.event_name == 'issue_comment' && - github.event.issue.pull_request && - github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA' - ) - uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - with: - path-to-signatures: "signatures/version1/cla.json" - path-to-document: "https://github.com/blitzcrieg1/agentmetry/blob/master/CLA.md" - branch: "cla-signatures" - allowlist: dependabot[bot],greenkeeper[bot] - custom-notsigned-prcomment: > - Thank you for your submission. Before we can merge, please sign our - [Contributor License Agreement (CLA v1.0)](https://github.com/blitzcrieg1/agentmetry/blob/master/CLA.md) - by replying to this comment with exactly: - **"I have read the CLA Document and I hereby sign the CLA"** - Corporate contributors: see [CCLA.md](https://github.com/blitzcrieg1/agentmetry/blob/master/CCLA.md). diff --git a/CLAUDE.md b/CLAUDE.md index e8652be2..a83d1dd9 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -204,7 +204,7 @@ do not do it. **Commit only when asked.** Do the work, report it, and wait. This is a standing preference and it is not negotiable by convenience. -**Branch and PR.** `master` is protected with five required checks and +**Branch and PR.** `master` is protected with four required checks and `enforce_admins` on, so nothing merges from a direct push. Match the existing commit-message voice: what changed, why it was wrong before, what it cost. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a373155..02aef17f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,9 +93,10 @@ Do **not** open a public issue for a vulnerability. See [SECURITY.md](SECURITY.m All pull requests require a signed **[Individual CLA (CLA.md)](CLA.md)** before merge. 1. Open your pull request. -2. The CLA Assistant bot will comment with signing instructions. -3. Reply to that comment with exactly: **`I have read the CLA Document and I hereby sign the CLA`** -4. The bot records your GitHub username in `signatures/version1/cla.json`. +2. If you have not signed before, the maintainer will ask you to sign in a comment. +3. Reply on the pull request with exactly: **`I have read the CLA Document and I hereby sign the CLA`** +4. The maintainer records your GitHub username, and a link to that comment, in + `signatures/version1/cla.json` on the `cla-signatures` branch. You sign once. **What you are agreeing to:** You retain copyright in your contribution. You grant the Project Owner (blitzcrieg1) the rights in CLA.md, including use under @@ -112,13 +113,20 @@ code you submit, including output from generative AI tools (CLA.md §7). We do **not** require Developer Certificate of Origin (DCO) sign-off; the CLA covers inbound licensing. -## Maintainer: branch protection +## Maintainer: checking the CLA -Require the CLA check before merging to the default branch: +There is no CLA bot. The `contributor-assistant/github-action` workflow ran +until 2026-11-16, when the archived action stopped starting, and it was removed +rather than kept failing on every pull request. Signatures it collected are on +the `cla-signatures` branch and stay valid. -1. GitHub → **Settings** → **Branches** → branch protection for `master` -2. Enable **Require status checks to pass** -3. Require the check named **`CLA Assistant`** (or the status context emitted on PRs) -4. Enable **Require pull request reviews** as appropriate for your team +Before merging a pull request from anyone not in +`signatures/version1/cla.json` on that branch: + +1. Ask them to reply with the sentence above, and wait for it. +2. Add an entry to `cla.json` in the same shape as the existing ones (`name`, + `id`, `comment_id`, `created_at`, `repoId`, `pullRequestNo`) and commit it to + `cla-signatures`. +3. Then merge. Dependabot needs no signature. See also [COMMERCIAL.md](COMMERCIAL.md) for non-binding commercial-licensing intent. diff --git a/docs/legal/pre-cla-audit.md b/docs/legal/pre-cla-audit.md index f2a075c7..9a7b9ead 100644 --- a/docs/legal/pre-cla-audit.md +++ b/docs/legal/pre-cla-audit.md @@ -11,7 +11,9 @@ All commits on `master` through `6f65181` are authored by **blitzcrieg1** ## Going forward -- External pull requests **must** sign [CLA.md](../CLA.md) via the CLA Assistant bot. +- External pull requests **must** sign [CLA.md](../CLA.md) before merge. Until + 2026-11-16 the CLA Assistant bot collected signatures; since then the maintainer + does (see CONTRIBUTING.md). - Corporate contributors must file a [Corporate CLA request](../../issues/new?template=corporate-cla.yml) or email **legal@agentmetry.ai** once configured. - Maintainer direct pushes to `master` are allowed (`enforce_admins: false` on branch diff --git a/signatures/version1/README.md b/signatures/version1/README.md index dd113a30..62600f1d 100644 --- a/signatures/version1/README.md +++ b/signatures/version1/README.md @@ -1,13 +1,16 @@ # CLA signatures (ICLA v1.0) -The [CLA Assistant](https://github.com/contributor-assistant/github-action) workflow -records individual contributor signatures in `cla.json` in this directory on the -**`cla-signatures`** branch (kept unprotected so the bot can commit). The bot creates -the file automatically — **do not** commit an empty `cla.json` manually. +Individual contributor signatures are recorded in `cla.json` in this directory on +the **`cla-signatures`** branch, not on `master`. + +Until 2026-11-16 the [CLA Assistant](https://github.com/contributor-assistant/github-action) +workflow wrote them. That action is archived and stopped starting, so the +workflow was removed and the maintainer now adds each signature by hand, linking +the pull request comment in which the contributor signed. The steps are in +[CONTRIBUTING.md](../../CONTRIBUTING.md#maintainer-checking-the-cla). - **CLA text:** [CLA.md](../../CLA.md) (version 1.0) -- **Do not hand-edit** `cla.json` except via the automated signing flow or a - documented maintainer migration. +- Edit `cla.json` only to add a signature that exists as a comment on a pull request. When CLA v2.0 is published, a new directory `signatures/version2/` will be used; existing v1 signatures remain valid for contributions made under v1.