File tree 11 files changed +55
-13
lines changed
examples/public-repository
11 files changed +55
-13
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
8
8
## [ Unreleased]
9
9
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
+
10
22
## [ 0.11.0]
11
23
12
24
### BREAKING CHANGES
@@ -322,13 +334,9 @@ Please review plans and report regressions and issues asap so we can improve doc
322
334
- This is the initial release of our GitHub Repository module with support for
323
335
creating and managing GitHub Repositories for Organizations.
324
336
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
328
339
[ 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
-
332
340
[ 0.10.1 ] : https://github.com/mineiros-io/terraform-github-repository/compare/v0.10.0...v0.10.1
333
341
[ 0.10.0 ] : https://github.com/mineiros-io/terraform-github-repository/compare/v0.9.2...v0.10.0
334
342
[ 0.9.2 ] : https://github.com/mineiros-io/terraform-github-repository/compare/v0.9.1...v0.9.2
Original file line number Diff line number Diff line change @@ -129,6 +129,7 @@ See [variables.tf] and [examples/] for details and use-cases.
129
129
` allow_merge_commit ` ,
130
130
` allow_rebase_merge ` ,
131
131
` allow_squash_merge ` ,
132
+ ` allow_auto_merge ` ,
132
133
` has_downloads ` ,
133
134
` auto_init ` ,
134
135
` gitignore_template ` ,
@@ -185,6 +186,15 @@ See [variables.tf] and [examples/] for details and use-cases.
185
186
186
187
Default is ` false ` .
187
188
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
+
188
198
- [ ** ` description ` ** ] ( #var-description ) : * (Optional ` string ` )* <a name =" var-description " ></a >
189
199
190
200
A description of the repository.
Original file line number Diff line number Diff line change @@ -147,6 +147,7 @@ section {
147
147
`allow_merge_commit`,
148
148
`allow_rebase_merge`,
149
149
`allow_squash_merge`,
150
+ `allow_auto_merge`,
150
151
`has_downloads`,
151
152
`auto_init`,
152
153
`gitignore_template`,
@@ -219,6 +220,17 @@ section {
219
220
END
220
221
}
221
222
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
+
222
234
variable "description" {
223
235
type = string
224
236
default = " "
Original file line number Diff line number Diff line change @@ -108,12 +108,7 @@ Run `terraform destroy` to destroy all resources again.
108
108
109
109
<!-- References -->
110
110
111
- <!-- markdown-link-check-disable -->
112
-
113
111
[ main.tf ] : https://github.com/mineiros-io/terraform-github-repository/blob/main/examples/public-respository/main.tf
114
-
115
- <!-- markdown-link-check-enable -->
116
-
117
112
[ homepage ] : https://mineiros.io/?ref=terraform-github-repository
118
113
[ badge-license ] : https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
119
114
[ 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
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ module "repository" {
23
23
allow_merge_commit = true
24
24
allow_rebase_merge = false
25
25
allow_squash_merge = false
26
+ allow_auto_merge = true
26
27
has_downloads = false
27
28
auto_init = true
28
29
gitignore_template = " Terraform"
Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ locals {
15
15
allow_merge_commit = var. allow_merge_commit == null ? lookup (var. defaults , " allow_merge_commit" , true ) : var. allow_merge_commit
16
16
allow_rebase_merge = var. allow_rebase_merge == null ? lookup (var. defaults , " allow_rebase_merge" , false ) : var. allow_rebase_merge
17
17
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
18
19
delete_branch_on_merge = var. delete_branch_on_merge == null ? lookup (var. defaults , " delete_branch_on_merge" , true ) : var. delete_branch_on_merge
19
20
is_template = var. is_template == null ? lookup (var. defaults , " is_template" , false ) : var. is_template
20
21
has_downloads = var. has_downloads == null ? lookup (var. defaults , " has_downloads" , false ) : var. has_downloads
Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ module "repository" {
39
39
allow_merge_commit = var. allow_merge_commit
40
40
allow_rebase_merge = var. allow_rebase_merge
41
41
allow_squash_merge = var. allow_squash_merge
42
+ allow_auto_merge = var. allow_auto_merge
42
43
delete_branch_on_merge = var. delete_branch_on_merge
43
44
is_template = var. is_template
44
45
has_downloads = var. has_downloads
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ terraform {
6
6
required_providers {
7
7
github = {
8
8
source = " integrations/github"
9
- version = " ~> 4.10 "
9
+ version = " ~> 4.19 "
10
10
}
11
11
tls = " ~> 2.1"
12
12
}
Original file line number Diff line number Diff line change @@ -64,6 +64,13 @@ variable "allow_rebase_merge" {
64
64
default = true
65
65
}
66
66
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
+
67
74
variable "has_downloads" {
68
75
description = " Set to true to enable the (deprecated) downloads features on the repository."
69
76
type = bool
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ variable "defaults" {
28
28
# allow_merge_commit = true
29
29
# allow_rebase_merge = false
30
30
# allow_squash_merge = false
31
+ # allow_auto_merge = false
31
32
# has_downloads = false
32
33
# auto_init = true
33
34
# gitignore_template = "terraform"
@@ -99,6 +100,12 @@ variable "allow_rebase_merge" {
99
100
default = null
100
101
}
101
102
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
+
102
109
variable "delete_branch_on_merge" {
103
110
description = " (Optional) Whether or not to delete the merged branch after merging a pull request. (Default: false)"
104
111
type = bool
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ terraform {
10
10
required_providers {
11
11
github = {
12
12
source = " integrations/github"
13
- version = " ~> 4.10 "
13
+ version = " ~> 4.19.2 "
14
14
}
15
15
}
16
16
}
You can’t perform that action at this time.
0 commit comments