From c9c71265be6973b04cff55fa056dafc850be6310 Mon Sep 17 00:00:00 2001 From: Nikolai Emil Damm Date: Sat, 14 Nov 2026 19:48:33 +0100 Subject: [PATCH] feat(rulesets): require a merge queue on agent-plugins Adds a net-new repository ruleset with platform's merge-queue settings, so agent-plugins' required checks run on the exact merge result. It replaces agent-plugins' recheck-open-prs workflow (devantler-tech/agent-plugins#704). Co-Authored-By: Claude Opus 5.5 --- deploy/repository-rulesets/README.md | 1 + deploy/repository-rulesets/kustomization.yaml | 1 + .../require-merge-queue-on-agent-plugins.yaml | 53 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 deploy/repository-rulesets/require-merge-queue-on-agent-plugins.yaml diff --git a/deploy/repository-rulesets/README.md b/deploy/repository-rulesets/README.md index a4f28c7e..015539e6 100644 --- a/deploy/repository-rulesets/README.md +++ b/deploy/repository-rulesets/README.md @@ -18,6 +18,7 @@ observes. | File | Repo | Ruleset | Policy | |---|---|---|---| | `require-cla-gate-on-world-at-ruin.yaml` | `world-at-ruin` | Require CLA gate | Managed (net-new; Observe + Create + Update + LateInitialize) | +| `require-merge-queue-on-agent-plugins.yaml` | `agent-plugins` | Require merge queue | Managed (net-new; Observe + Create + Update + LateInitialize, no Delete); settings copied from platform | | `require-merge-queue-on-platform.yaml` | `platform` | Require merge queue | Managed import (Observe + Update; full ruleset backfilled, no LateInitialize, no Delete) | | `require-reviewed-admission-on-monorepo.yaml` | `monorepo` | Require reviewed repository admission | Managed, active; exact GitHub Actions executed result, default branch only, no bypass or Delete | | `require-reviewed-admission-on-dotgithub.yaml` | `.github` | Require reviewed repository admission | Managed, active; exact GitHub Actions executed result, default branch only, no bypass or Delete | diff --git a/deploy/repository-rulesets/kustomization.yaml b/deploy/repository-rulesets/kustomization.yaml index fec23dcc..2c6e8f1a 100644 --- a/deploy/repository-rulesets/kustomization.yaml +++ b/deploy/repository-rulesets/kustomization.yaml @@ -8,6 +8,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - require-cla-gate-on-world-at-ruin.yaml + - require-merge-queue-on-agent-plugins.yaml - require-merge-queue-on-platform.yaml - require-validation-on-dotnet-template.yaml - require-validation-on-go-template.yaml diff --git a/deploy/repository-rulesets/require-merge-queue-on-agent-plugins.yaml b/deploy/repository-rulesets/require-merge-queue-on-agent-plugins.yaml new file mode 100644 index 00000000..861e254e --- /dev/null +++ b/deploy/repository-rulesets/require-merge-queue-on-agent-plugins.yaml @@ -0,0 +1,53 @@ +# agent-plugins' "Require merge queue" rule on the default branch +# (devantler-tech/agent-plugins#704). merge_queue is a repo-only rule type; org +# rulesets cannot carry it. +# +# The queue runs the required checks on the exact result each PR would land as, +# so a PR opened before a new gate reached main still meets that gate before it +# merges. It replaces agent-plugins' own recheck-open-prs workflow, which only +# re-ran open PRs after main moved. agent-plugins' CI must run on `merge_group` +# before this rule is active, or queued PRs would wait for a check that never +# starts. +# +# The queue settings are copied from require-merge-queue-on-platform.yaml, +# including the OrganizationAdmin bypass. The 120-minute response window absorbs +# hosted-runner queueing (platform#3097). +# +# Net-new and managed: no external-name, so Crossplane creates it on first +# reconcile. LateInitialize writes the created id back as the external-name, so a +# provider restart cannot create a second copy. No Delete: removing this file +# orphans the ruleset instead of deleting a live merge gate. +apiVersion: repo.github.m.upbound.io/v1alpha1 +kind: RepositoryRuleset +metadata: + name: agent-plugins-require-merge-queue +spec: + managementPolicies: + - Observe + - Create + - Update + - LateInitialize + forProvider: + repository: agent-plugins + name: Require merge queue + target: branch + enforcement: active + bypassActors: + - actorType: OrganizationAdmin + bypassMode: always + conditions: + - refName: + - include: ["~DEFAULT_BRANCH"] + exclude: [] + rules: + - mergeQueue: + - checkResponseTimeoutMinutes: 120 + groupingStrategy: ALLGREEN + maxEntriesToBuild: 2 + maxEntriesToMerge: 1 + mergeMethod: SQUASH + minEntriesToMerge: 1 + minEntriesToMergeWaitMinutes: 5 + providerConfigRef: + kind: ProviderConfig + name: default