diff options
| author | Franck Cuny <franck@fcuny.net> | 2022-10-23 13:27:10 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2022-10-23 13:29:38 -0700 |
| commit | c238f993553654a72a490fd856b4f4e6d62eee58 (patch) | |
| tree | a7a75dd5b21b0959d57b1c5492fe94a58590d5bc /ops | |
| parent | feat(tools/git-broom): CLI to delete local and remote branches (diff) | |
| download | infra-c238f993553654a72a490fd856b4f4e6d62eee58.tar.gz | |
ref(ops/github): only allow merge commit
While not great, this is the default workflow on GitHub. It's also what
allows my `git-broom` CLI to work with branches on GitHub.
Diffstat (limited to 'ops')
| -rw-r--r-- | ops/github/repositories.tf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ops/github/repositories.tf b/ops/github/repositories.tf index 15a5b1d..ba5cf60 100644 --- a/ops/github/repositories.tf +++ b/ops/github/repositories.tf @@ -13,9 +13,9 @@ resource "github_repository" "repos" { has_issues = try(each.value.has_issues, true) has_projects = false has_wiki = false - allow_merge_commit = false - allow_squash_merge = true - allow_rebase_merge = true + allow_merge_commit = true + allow_squash_merge = false + allow_rebase_merge = false vulnerability_alerts = try(each.value.vulnerability_alerts, false) delete_branch_on_merge = try(!each.value.archived, true) } |