Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add [squash_merge|merge]_commit_[messsage|title] #167

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
10 changes: 8 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ resource "github_repository" "repository" {
archived = var.archived
topics = local.topics

merge_commit_message = var.merge_commit_message
merge_commit_title = var.merge_commit_title

squash_merge_commit_message = var.squash_merge_commit_message
squash_merge_commit_title = var.squash_merge_commit_title

archive_on_destroy = var.archive_on_destroy
vulnerability_alerts = local.vulnerability_alerts

Expand Down Expand Up @@ -259,8 +265,8 @@ resource "github_branch_protection_v3" "branch_protection" {
for_each = local.required_status_checks[count.index]

content {
strict = required_status_checks.value.strict
contexts = required_status_checks.value.contexts
strict = required_status_checks.value.strict
checks = required_status_checks.value.contexts
}
}

Expand Down
24 changes: 24 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,30 @@ variable "topics" {
default = null
}

variable "merge_commit_title" {
description = "Can be PR_TITLE or MERGE_MESSAGE for a default merge commit title. Applicable only if allow_merge_commit is true."
type = string
default = null
}

variable "merge_commit_message" {
description = "Can be PR_BODY, PR_TITLE, or BLANK for a default merge commit message. Applicable only if allow_merge_commit is true."
type = string
default = null
}

variable "squash_merge_commit_title" {
description = "(Optional) Can be PR_TITLE or COMMIT_OR_PR_TITLE for a default squash merge commit title. Applicable only if allow_squash_merge is true."
type = string
default = null
}

variable "squash_merge_commit_message" {
description = "(Optional) Can be PR_BODY, COMMIT_MESSAGES, or BLANK for a default squash merge commit message. Applicable only if allow_squash_merge is true."
type = string
default = null
}

variable "extra_topics" {
description = "(Optional) The list of additional topics of the repository. (Default: [])"
type = list(string)
Expand Down
Loading