From bbfe0edf2f20d8f0081714b28ccde50a9f9bc26c Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 4 Jul 2026 22:52:02 +1000 Subject: [PATCH] Enable delete-branch-after-merge on all repos Merged PR branches should be cleaned up automatically everywhere, for a consistent workflow across the estate. - Flip default_delete_branch_after_merge from false to true on the 10 repos that had it disabled. - Add default_delete_branch_after_merge: true to the 3 repos that were missing the field (terraform-git, terraform-provider-litellmvaultsecret, vault-plugin-secrets-litellm). --- .../unkin/repository/app-sudaporn-research-individual.yaml | 2 +- .../unkin/repository/app-sudaporn-research-normalised.yaml | 2 +- config/git.unkin.net/unkin/repository/certmanager.yaml | 2 +- config/git.unkin.net/unkin/repository/container-devcompute.yaml | 2 +- config/git.unkin.net/unkin/repository/initbuilder.yaml | 2 +- .../unkin/repository/rpmbuild-internal-ca-certificates.yaml | 2 +- .../git.unkin.net/unkin/repository/rpmbuild-jellyfin-web.yaml | 2 +- config/git.unkin.net/unkin/repository/streamstack.yaml | 2 +- config/git.unkin.net/unkin/repository/terraform-git.yaml | 1 + config/git.unkin.net/unkin/repository/terraform-nomad.yaml | 2 +- .../unkin/repository/terraform-provider-artifactapi.yaml | 2 +- .../unkin/repository/terraform-provider-litellmvaultsecret.yaml | 1 + .../unkin/repository/vault-plugin-secrets-litellm.yaml | 1 + 13 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/git.unkin.net/unkin/repository/app-sudaporn-research-individual.yaml b/config/git.unkin.net/unkin/repository/app-sudaporn-research-individual.yaml index fafdc8b..73211ac 100644 --- a/config/git.unkin.net/unkin/repository/app-sudaporn-research-individual.yaml +++ b/config/git.unkin.net/unkin/repository/app-sudaporn-research-individual.yaml @@ -1,4 +1,4 @@ description: "Sudaporn's Research Data visualisation, normalised " private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/app-sudaporn-research-normalised.yaml b/config/git.unkin.net/unkin/repository/app-sudaporn-research-normalised.yaml index ec10ad0..f01e9b3 100644 --- a/config/git.unkin.net/unkin/repository/app-sudaporn-research-normalised.yaml +++ b/config/git.unkin.net/unkin/repository/app-sudaporn-research-normalised.yaml @@ -1,4 +1,4 @@ description: "Sudaporn's Research Data visualisation, normalised" private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/certmanager.yaml b/config/git.unkin.net/unkin/repository/certmanager.yaml index 80c756e..d25bd79 100644 --- a/config/git.unkin.net/unkin/repository/certmanager.yaml +++ b/config/git.unkin.net/unkin/repository/certmanager.yaml @@ -1,7 +1,7 @@ description: "Vault PKI certificate issuance and SSH host key signing tool for Puppet-managed infrastructure" private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true branch_protection: - rule_name: "master" enable_push: false diff --git a/config/git.unkin.net/unkin/repository/container-devcompute.yaml b/config/git.unkin.net/unkin/repository/container-devcompute.yaml index f00589d..ef95f8e 100644 --- a/config/git.unkin.net/unkin/repository/container-devcompute.yaml +++ b/config/git.unkin.net/unkin/repository/container-devcompute.yaml @@ -1,3 +1,3 @@ description: "Docker image to be used in Kubernetes as a developers container" private: false -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/initbuilder.yaml b/config/git.unkin.net/unkin/repository/initbuilder.yaml index fbbe769..85bcc49 100644 --- a/config/git.unkin.net/unkin/repository/initbuilder.yaml +++ b/config/git.unkin.net/unkin/repository/initbuilder.yaml @@ -1,3 +1,3 @@ description: "A repository for building initrd.img in docker " private: false -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/rpmbuild-internal-ca-certificates.yaml b/config/git.unkin.net/unkin/repository/rpmbuild-internal-ca-certificates.yaml index f36b569..f2526d8 100644 --- a/config/git.unkin.net/unkin/repository/rpmbuild-internal-ca-certificates.yaml +++ b/config/git.unkin.net/unkin/repository/rpmbuild-internal-ca-certificates.yaml @@ -1,4 +1,4 @@ description: "Package the internal ca-certificates" private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/rpmbuild-jellyfin-web.yaml b/config/git.unkin.net/unkin/repository/rpmbuild-jellyfin-web.yaml index 0c6cd8e..de391e5 100644 --- a/config/git.unkin.net/unkin/repository/rpmbuild-jellyfin-web.yaml +++ b/config/git.unkin.net/unkin/repository/rpmbuild-jellyfin-web.yaml @@ -1,5 +1,5 @@ description: "Build rpms for jellyfin-web" private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true archived: true diff --git a/config/git.unkin.net/unkin/repository/streamstack.yaml b/config/git.unkin.net/unkin/repository/streamstack.yaml index cc7a4bd..fa9a000 100644 --- a/config/git.unkin.net/unkin/repository/streamstack.yaml +++ b/config/git.unkin.net/unkin/repository/streamstack.yaml @@ -1,3 +1,3 @@ description: "A stack of microservices that aim to offer a distributed streaming service." private: false -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true diff --git a/config/git.unkin.net/unkin/repository/terraform-git.yaml b/config/git.unkin.net/unkin/repository/terraform-git.yaml index a2abcdc..d2b9b94 100644 --- a/config/git.unkin.net/unkin/repository/terraform-git.yaml +++ b/config/git.unkin.net/unkin/repository/terraform-git.yaml @@ -1,6 +1,7 @@ description: "Manage Gitea resources, teams, repos, and Woodpecker CI via Terraform" private: false default_branch: "main" +default_delete_branch_after_merge: true branch_protection: - rule_name: "main" enable_push: false diff --git a/config/git.unkin.net/unkin/repository/terraform-nomad.yaml b/config/git.unkin.net/unkin/repository/terraform-nomad.yaml index f2ad7b9..e1a9b33 100644 --- a/config/git.unkin.net/unkin/repository/terraform-nomad.yaml +++ b/config/git.unkin.net/unkin/repository/terraform-nomad.yaml @@ -1,7 +1,7 @@ description: "Manage nomad with Terraform" private: false default_branch: "master" -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true branch_protection: - rule_name: "master" enable_push: false diff --git a/config/git.unkin.net/unkin/repository/terraform-provider-artifactapi.yaml b/config/git.unkin.net/unkin/repository/terraform-provider-artifactapi.yaml index 759bcd9..7fc3cce 100644 --- a/config/git.unkin.net/unkin/repository/terraform-provider-artifactapi.yaml +++ b/config/git.unkin.net/unkin/repository/terraform-provider-artifactapi.yaml @@ -1,6 +1,6 @@ description: "Terraform provider for managing ArtifactAPI" private: false -default_delete_branch_after_merge: false +default_delete_branch_after_merge: true branch_protection: - rule_name: "main" enable_push: false diff --git a/config/git.unkin.net/unkin/repository/terraform-provider-litellmvaultsecret.yaml b/config/git.unkin.net/unkin/repository/terraform-provider-litellmvaultsecret.yaml index b151805..a20c2ed 100644 --- a/config/git.unkin.net/unkin/repository/terraform-provider-litellmvaultsecret.yaml +++ b/config/git.unkin.net/unkin/repository/terraform-provider-litellmvaultsecret.yaml @@ -1,6 +1,7 @@ description: "Terraform provider for the Vault/OpenBao LiteLLM dynamic secrets engine (litellmvaultsecret)" private: false default_branch: "main" +default_delete_branch_after_merge: true # Squash-only: the gitea provider has no "default merge style", so we restrict # the allowed styles to squash to force it. allow_merge_commits: false diff --git a/config/git.unkin.net/unkin/repository/vault-plugin-secrets-litellm.yaml b/config/git.unkin.net/unkin/repository/vault-plugin-secrets-litellm.yaml index c9ee848..d859cb6 100644 --- a/config/git.unkin.net/unkin/repository/vault-plugin-secrets-litellm.yaml +++ b/config/git.unkin.net/unkin/repository/vault-plugin-secrets-litellm.yaml @@ -1,6 +1,7 @@ description: "HashiCorp Vault / OpenBao dynamic secrets engine for LiteLLM virtual keys" private: false default_branch: "main" +default_delete_branch_after_merge: true # Squash-only: the gitea provider has no "default merge style", so we restrict # the allowed styles to squash to force it. allow_merge_commits: false