Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions modules/repository-policy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,19 @@ resource "github_repository_ruleset" "protect_main" {
required_review_thread_resolution = true
}

dynamic "merge_queue" {
for_each = var.repository_policies[each.value].merge_queue == null ? [] : [var.repository_policies[each.value].merge_queue]
content {
grouping_strategy = merge_queue.value.grouping_strategy
max_entries_to_build = merge_queue.value.max_entries_to_build
max_entries_to_merge = merge_queue.value.max_entries_to_merge
min_entries_to_merge = merge_queue.value.min_entries_to_merge
min_entries_to_merge_wait_minutes = merge_queue.value.min_entries_to_merge_wait_minutes
check_response_timeout_minutes = merge_queue.value.check_response_timeout_minutes
merge_method = merge_queue.value.merge_method
}
}

dynamic "required_status_checks" {
for_each = length(var.repository_policies[each.value].required_checks) > 0 ? [1] : []
content {
Expand Down
10 changes: 10 additions & 0 deletions modules/repository-policy/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ variable "repository_policies" {
include = list(string)
bypass_user_ids = list(number)
})), {})
# Merge queue on the default branch. null (the default) leaves the queue off.
merge_queue = optional(object({
grouping_strategy = string
max_entries_to_build = number
max_entries_to_merge = number
min_entries_to_merge = number
min_entries_to_merge_wait_minutes = number
check_response_timeout_minutes = number
merge_method = string
}))
}))

validation {
Expand Down
28 changes: 24 additions & 4 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ variable "repository_policies" {
include = list(string)
bypass_user_ids = list(number)
})), {})
# Merge queue on the default branch. null (the default) leaves the queue off.
merge_queue = optional(object({
grouping_strategy = string
max_entries_to_build = number
max_entries_to_merge = number
min_entries_to_merge = number
min_entries_to_merge_wait_minutes = number
check_response_timeout_minutes = number
merge_method = string
}))
}))

validation {
Expand Down Expand Up @@ -272,10 +282,20 @@ variable "repository_policies" {
required_checks = ["DCO", "Required"]
}
"velnor-new" = {
visibility = "public"
required_checks = ["Required"]
strict_required_status_checks = true
protect_tags_update = true
visibility = "public"
required_checks = ["Required", "Required verdict"]
protect_tags_update = true
# Batched queue (owner decision 2026-11-18): 13 runners fit about one full CI run,
# so only the newest entry of a group must pass and up to 10 PRs merge per run.
merge_queue = {
grouping_strategy = "HEADGREEN"
max_entries_to_build = 2
max_entries_to_merge = 10
min_entries_to_merge = 1
min_entries_to_merge_wait_minutes = 5
check_response_timeout_minutes = 90
merge_method = "SQUASH"
}
tag_creation_rulesets = {
# Only the owner may create release tags (tailrocks/velnor-new#682).
# The velnor-release GitHub App replaces this bypass later.
Expand Down