Skip to content

Commit b309fac

Browse files
authored
Merge branch 'main' into fix-deprecated-lookup-function
2 parents b8c3462 + caf8ac5 commit b309fac

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,14 @@
33
#
44
# Order is important: the last matching pattern has the highest precedence
55

6-
# These owners will be the default owners for everything
7-
* @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors
8-
96
# Cloud Posse must review any changes to Makefiles
107
**/Makefile @cloudposse-terraform-components/engineering
118
**/Makefile.* @cloudposse-terraform-components/engineering
129

13-
# Cloud Posse must review any changes to GitHub actions
14-
.github/* @cloudposse-terraform-components/engineering
15-
16-
# Cloud Posse must review any changes to standard context definition,
17-
# but some changes can be rubber-stamped.
18-
**/*.tf @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
19-
README.yaml @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
20-
README.md @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
21-
docs/*.md @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
10+
# Cloud Posse must review any changes to pre-commit configuration
11+
.pre-commit-config.yaml @cloudposse-terraform-components/engineering
2212

23-
# Cloud Posse Admins must review all changes to CODEOWNERS or the mergify configuration
13+
# Cloud Posse Admins must review all changes to CODEOWNERS, github configuration or the mergify configuration
14+
.github/* @cloudposse-terraform-components/admins
2415
.github/mergify.yml @cloudposse-terraform-components/admins
2516
.github/CODEOWNERS @cloudposse-terraform-components/admins

.github/settings.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ repository:
55
description: This component is responsible for provision all the necessary infrastructure to deploy Datadog Lambda forwarders
66
homepage: https://cloudposse.com/accelerate
77
topics: terraform, terraform-component
8+
9+
10+
11+
12+
13+
14+
15+
16+

.github/workflows/automerge.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: auto merge
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
pr_number:
6+
description: 'PR number'
7+
required: true
8+
type: string
9+
10+
permissions:
11+
pull-requests: write
12+
id-token: write
13+
contents: write
14+
15+
jobs:
16+
automerge:
17+
uses: cloudposse-terraform-components/.github/.github/workflows/shared-auto-merge.yml@main
18+
with:
19+
pr_number: ${{ inputs.pr_number }}
20+
secrets: inherit

.github/workflows/branch.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ on:
55
branches:
66
- main
77
- release/**
8-
types: [opened, synchronize, reopened, labeled, unlabeled]
8+
types: [opened, synchronize, reopened]
99
push:
1010
branches:
1111
- main
1212
- release/v*
1313
paths-ignore:
1414
- '.github/**'
1515
- 'test/**'
16+
merge_group:
17+
types: [checks_requested]
1618

1719
permissions:
1820
contents: write

0 commit comments

Comments
 (0)