Skip to content

Commit 9e8a04c

Browse files
GergGerg
authored
Merge branch 'main' into add-teodora-nikolova-1
2 parents 2d9e92f + be2633b commit 9e8a04c

File tree

6 files changed

+126
-3
lines changed

6 files changed

+126
-3
lines changed

‎orgs/branchprotection.yml

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,71 @@ branch-protection:
3737
protect: false
3838
docs-running-cf:
3939
protect: false
40+
go-envstruct:
41+
protect: true
42+
enforce_admins: true
43+
allow_force_pushes: false
44+
allow_deletions: false
45+
allow_disabled_policies: true
46+
required_pull_request_reviews:
47+
dismiss_stale_reviews: true
48+
require_code_owner_reviews: false
49+
required_approving_review_count: 1
50+
bypass_pull_request_allowances:
51+
teams: ["wg-app-runtime-platform-bots"]
52+
include: [ "^master$" ]
53+
go-diodes:
54+
protect: true
55+
enforce_admins: true
56+
allow_force_pushes: false
57+
allow_deletions: false
58+
allow_disabled_policies: true
59+
required_pull_request_reviews:
60+
dismiss_stale_reviews: true
61+
require_code_owner_reviews: false
62+
required_approving_review_count: 1
63+
bypass_pull_request_allowances:
64+
teams: ["wg-app-runtime-platform-bots"]
65+
include: [ "^main$" ]
66+
go-log-cache:
67+
protect: true
68+
enforce_admins: true
69+
allow_force_pushes: false
70+
allow_deletions: false
71+
allow_disabled_policies: true
72+
required_pull_request_reviews:
73+
dismiss_stale_reviews: true
74+
require_code_owner_reviews: false
75+
required_approving_review_count: 1
76+
bypass_pull_request_allowances:
77+
teams: ["wg-app-runtime-platform-bots"]
78+
include: [ "^main$" ]
79+
go-loggregator:
80+
protect: true
81+
enforce_admins: true
82+
allow_force_pushes: false
83+
allow_deletions: false
84+
allow_disabled_policies: true
85+
required_pull_request_reviews:
86+
dismiss_stale_reviews: true
87+
require_code_owner_reviews: false
88+
required_approving_review_count: 1
89+
bypass_pull_request_allowances:
90+
teams: ["wg-app-runtime-platform-bots"]
91+
include: [ "^main$" ]
92+
go-metric-registry:
93+
protect: true
94+
enforce_admins: true
95+
allow_force_pushes: false
96+
allow_deletions: false
97+
allow_disabled_policies: true
98+
required_pull_request_reviews:
99+
dismiss_stale_reviews: true
100+
require_code_owner_reviews: false
101+
required_approving_review_count: 1
102+
bypass_pull_request_allowances:
103+
teams: ["wg-app-runtime-platform-bots"]
104+
include: [ "^main$" ]
40105
haproxy-boshrelease:
41106
protect: true
42107
enforce_admins: false
@@ -52,6 +117,45 @@ branch-protection:
52117
required_approving_review_count: 1
53118
bypass_pull_request_allowances:
54119
teams: ["wg-app-runtime-platform-bots"]
120+
log-cache-cli:
121+
protect: true
122+
enforce_admins: true
123+
allow_force_pushes: false
124+
allow_deletions: false
125+
allow_disabled_policies: true
126+
required_pull_request_reviews:
127+
dismiss_stale_reviews: true
128+
require_code_owner_reviews: false
129+
required_approving_review_count: 1
130+
bypass_pull_request_allowances:
131+
teams: ["wg-app-runtime-platform-bots"]
132+
include: [ "^main$" ]
133+
loggregator-tools:
134+
protect: true
135+
enforce_admins: true
136+
allow_force_pushes: false
137+
allow_deletions: false
138+
allow_disabled_policies: true
139+
required_pull_request_reviews:
140+
dismiss_stale_reviews: true
141+
require_code_owner_reviews: false
142+
required_approving_review_count: 1
143+
bypass_pull_request_allowances:
144+
teams: ["wg-app-runtime-platform-bots"]
145+
include: [ "^master$" ]
146+
noaa:
147+
protect: true
148+
enforce_admins: true
149+
allow_force_pushes: false
150+
allow_deletions: false
151+
allow_disabled_policies: true
152+
required_pull_request_reviews:
153+
dismiss_stale_reviews: true
154+
require_code_owner_reviews: false
155+
required_approving_review_count: 1
156+
bypass_pull_request_allowances:
157+
teams: ["wg-app-runtime-platform-bots"]
158+
include: [ "^master$" ]
55159
pcap-release:
56160
protect: true
57161
enforce_admins: false
@@ -240,3 +344,18 @@ branch-protection:
240344
dismiss_stale_reviews: true
241345
require_code_owner_reviews: true
242346
required_approving_review_count: 1
347+
348+
# Foundational Infrastructure repos to skip branch protection on
349+
blackbox:
350+
protect: true
351+
enforce_admins: true
352+
allow_force_pushes: false
353+
allow_deletions: false
354+
allow_disabled_policies: true
355+
required_pull_request_reviews:
356+
dismiss_stale_reviews: true
357+
require_code_owner_reviews: false
358+
required_approving_review_count: 1
359+
bypass_pull_request_allowances:
360+
teams: ["wg-foundational-infrastructure-bots"]
361+
include: [ "^main$" ]

‎orgs/contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ orgs:
200200
- thitch97
201201
- TisVictress
202202
- tnikolova82
203+
- tomkennedy513
203204
- torsten-sap
204205
- totherme
205206
- uzabanov

‎orgs/org_user_management.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def delete_inactive_contributors(self, users_to_delete):
101101
path = f"{_SCRIPT_PATH}/contributors.yml"
102102
contributors_yaml = self._load_yaml_file(path)
103103
users_to_delete_lower = [user.lower() for user in users_to_delete]
104-
contributors_yaml["contributors"] = [c for c in contributors_yaml["contributors"] if c.lower() not in users_to_delete_lower]
104+
contributors_yaml["orgs"][self.github_org]["contributors"] = [
105+
c for c in contributors_yaml["orgs"][self.github_org]["contributors"] if c.lower() not in users_to_delete_lower
106+
]
105107
self._write_yaml_file(path, contributors_yaml)
106108

107109
def get_inactive_users_msg(self, users_to_delete, inactive_users_by_wg, tagusers):

‎orgs/orgs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,7 @@ orgs:
14321432
description: CF Router
14331433
has_projects: true
14341434
has_wiki: false
1435+
archived: true
14351436
goshims:
14361437
description: generated real/fake os shim objects for tdd in go
14371438
has_projects: true
@@ -2064,6 +2065,7 @@ orgs:
20642065
description: A standalone executable written in golang that continuously broadcasts
20652066
a route using NATS to the CF router.
20662067
has_projects: true
2068+
archived: true
20672069
routing-acceptance-tests:
20682070
default_branch: main
20692071
has_projects: true

‎toc/working-groups/app-runtime-platform.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,10 @@ areas:
354354
- cloudfoundry/cf-networking-helpers
355355
- cloudfoundry/cf-networking-onboarding
356356
- cloudfoundry/cf-networking-release
357-
- cloudfoundry/gorouter
358357
- cloudfoundry/haproxy-boshrelease
359358
- cloudfoundry/healthchecker-release
360359
- cloudfoundry/nats-release
361360
- cloudfoundry/policy_client
362-
- cloudfoundry/route-registrar
363361
- cloudfoundry/routing-api
364362
- cloudfoundry/routing-concourse
365363
- cloudfoundry/routing-info

‎toc/working-groups/docs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@ areas:
5959
- cloudfoundry/docs-dev-guide
6060
- cloudfoundry/docs-services
6161
- cloudfoundry/docs-credhub
62+
- cloudfoundry/docs-deploying-cf
6263
- cloudfoundry/docs-dotnet-core-tutorial
6364
```

0 commit comments

Comments
 (0)