Skip to content

Commit 16dc725

Browse files
authored
Merge branch 'main' into kassianh/docs/update-outputs
2 parents c3b96d4 + 603c1f4 commit 16dc725

File tree

11 files changed

+55
-13
lines changed

11 files changed

+55
-13
lines changed

CHANGELOG.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.12.0]
11+
12+
### BREAKING CHANGES
13+
14+
Bumped the minimum supported version of the GitHub Terraform Provider to `v4.19.2`
15+
since it contains a critical bugfix to support `required_approving_review_count = 0`
16+
on branch protection rules. Also, `allow_auto_merge` has been added in `v4.17.0`.
17+
18+
### Added
19+
20+
- Add support for `allow_auto_merge`
21+
1022
## [0.11.0]
1123

1224
### BREAKING CHANGES
@@ -322,13 +334,9 @@ Please review plans and report regressions and issues asap so we can improve doc
322334
- This is the initial release of our GitHub Repository module with support for
323335
creating and managing GitHub Repositories for Organizations.
324336

325-
<!-- markdown-link-check-disable -->
326-
327-
[unreleased]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.11.0...HEAD
337+
[unreleased]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.12.0...HEAD
338+
[0.12.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.11.0...v0.12.0
328339
[0.11.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.10.1...v0.11.0
329-
330-
<!-- markdown-link-check-enable -->
331-
332340
[0.10.1]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.10.0...v0.10.1
333341
[0.10.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.9.2...v0.10.0
334342
[0.9.2]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.9.1...v0.9.2

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ See [variables.tf] and [examples/] for details and use-cases.
129129
`allow_merge_commit`,
130130
`allow_rebase_merge`,
131131
`allow_squash_merge`,
132+
`allow_auto_merge`,
132133
`has_downloads`,
133134
`auto_init`,
134135
`gitignore_template`,
@@ -185,6 +186,15 @@ See [variables.tf] and [examples/] for details and use-cases.
185186

186187
Default is `false`.
187188

189+
- [**`allow_auto_merge`**](#var-allow_auto_merge): *(Optional `bool`)*<a name="var-allow_auto_merge"></a>
190+
191+
Set to `true` to allow [auto-merging](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)
192+
pull requests on the repository. If you enable auto-merge for a pull
193+
request, the pull request will merge automatically when all required
194+
reviews are met and status checks have passed.
195+
196+
Default is `false`.
197+
188198
- [**`description`**](#var-description): *(Optional `string`)*<a name="var-description"></a>
189199

190200
A description of the repository.

README.tfdoc.hcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ section {
147147
`allow_merge_commit`,
148148
`allow_rebase_merge`,
149149
`allow_squash_merge`,
150+
`allow_auto_merge`,
150151
`has_downloads`,
151152
`auto_init`,
152153
`gitignore_template`,
@@ -219,6 +220,17 @@ section {
219220
END
220221
}
221222

223+
variable "allow_auto_merge" {
224+
type = bool
225+
default = false
226+
description = <<-END
227+
Set to `true` to allow [auto-merging](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)
228+
pull requests on the repository. If you enable auto-merge for a pull
229+
request, the pull request will merge automatically when all required
230+
reviews are met and status checks have passed.
231+
END
232+
}
233+
222234
variable "description" {
223235
type = string
224236
default = ""

examples/public-repository/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ Run `terraform destroy` to destroy all resources again.
108108

109109
<!-- References -->
110110

111-
<!-- markdown-link-check-disable -->
112-
113111
[main.tf]: https://github.com/mineiros-io/terraform-github-repository/blob/main/examples/public-respository/main.tf
114-
115-
<!-- markdown-link-check-enable -->
116-
117112
[homepage]: https://mineiros.io/?ref=terraform-github-repository
118113
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
119114
[badge-terraform]: https://img.shields.io/badge/terraform-1.x%20|0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform

examples/public-repository/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module "repository" {
2323
allow_merge_commit = true
2424
allow_rebase_merge = false
2525
allow_squash_merge = false
26+
allow_auto_merge = true
2627
has_downloads = false
2728
auto_init = true
2829
gitignore_template = "Terraform"

main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ locals {
1515
allow_merge_commit = var.allow_merge_commit == null ? lookup(var.defaults, "allow_merge_commit", true) : var.allow_merge_commit
1616
allow_rebase_merge = var.allow_rebase_merge == null ? lookup(var.defaults, "allow_rebase_merge", false) : var.allow_rebase_merge
1717
allow_squash_merge = var.allow_squash_merge == null ? lookup(var.defaults, "allow_squash_merge", false) : var.allow_squash_merge
18+
allow_auto_merge = var.allow_auto_merge == null ? lookup(var.defaults, "allow_auto_merge", false) : var.allow_auto_merge
1819
delete_branch_on_merge = var.delete_branch_on_merge == null ? lookup(var.defaults, "delete_branch_on_merge", true) : var.delete_branch_on_merge
1920
is_template = var.is_template == null ? lookup(var.defaults, "is_template", false) : var.is_template
2021
has_downloads = var.has_downloads == null ? lookup(var.defaults, "has_downloads", false) : var.has_downloads

test/unit-complete/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ module "repository" {
3939
allow_merge_commit = var.allow_merge_commit
4040
allow_rebase_merge = var.allow_rebase_merge
4141
allow_squash_merge = var.allow_squash_merge
42+
allow_auto_merge = var.allow_auto_merge
4243
delete_branch_on_merge = var.delete_branch_on_merge
4344
is_template = var.is_template
4445
has_downloads = var.has_downloads

test/unit-complete/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terraform {
66
required_providers {
77
github = {
88
source = "integrations/github"
9-
version = "~> 4.10"
9+
version = "~> 4.19"
1010
}
1111
tls = "~> 2.1"
1212
}

test/unit-complete/variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ variable "allow_rebase_merge" {
6464
default = true
6565
}
6666

67+
variable "allow_auto_merge" {
68+
description = "Set to true to allow auto-merging pull requests on the repository."
69+
type = bool
70+
default = true
71+
}
72+
73+
6774
variable "has_downloads" {
6875
description = "Set to true to enable the (deprecated) downloads features on the repository."
6976
type = bool

variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ variable "defaults" {
2828
# allow_merge_commit = true
2929
# allow_rebase_merge = false
3030
# allow_squash_merge = false
31+
# allow_auto_merge = false
3132
# has_downloads = false
3233
# auto_init = true
3334
# gitignore_template = "terraform"
@@ -99,6 +100,12 @@ variable "allow_rebase_merge" {
99100
default = null
100101
}
101102

103+
variable "allow_auto_merge" {
104+
description = "(Optional) Set to true to allow auto-merging pull requests on the repository. If enabled for a pull request, the pull request will merge automatically when all required reviews are met and status checks have passed. (Default: false)"
105+
type = bool
106+
default = null
107+
}
108+
102109
variable "delete_branch_on_merge" {
103110
description = "(Optional) Whether or not to delete the merged branch after merging a pull request. (Default: false)"
104111
type = bool

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ terraform {
1010
required_providers {
1111
github = {
1212
source = "integrations/github"
13-
version = "~> 4.10"
13+
version = "~> 4.19.2"
1414
}
1515
}
1616
}

0 commit comments

Comments
 (0)