Skip to content

Commit 6f5a253

Browse files
authoredMay 3, 2023
fix: make settings file actually work (#313)
the settings file as it was before didn't actually apply branch protection rules, i've fixed that issue here and tested in the `publish-test` repo to ensure all settings present in the file actually do get applied
1 parent 816d8d6 commit 6f5a253

File tree

3 files changed

+37
-73
lines changed

3 files changed

+37
-73
lines changed
 

‎.github/settings.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,14 @@ repository:
1313
branches:
1414
- name: main
1515
protection:
16-
required_pull_request_reviews:
17-
required_pull_request_review_count: 1
18-
dismiss_stale_reviews: true
19-
require_code_owner_reviews: true
20-
restrictions:
21-
teams:
22-
- "npm/cli-team"
23-
enforce_admins: true
2416
required_status_checks: null
25-
- name: latest
26-
protection:
17+
enforce_admins: true
2718
required_pull_request_reviews:
28-
required_pull_request_review_count: 1
29-
dismiss_stale_reviews: true
19+
required_approving_review_count: 1
3020
require_code_owner_reviews: true
21+
require_last_push_approval: true
22+
dismiss_stale_reviews: true
3123
restrictions:
32-
teams:
33-
- "npm/cli-team"
34-
enforce_admins: true
35-
required_status_checks: null
24+
apps: []
25+
users: []
26+
teams: [ "cli-team" ]

‎lib/content/settings.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ repository:
99
enable_vulnerability_alerts: true
1010

1111
branches:
12-
{{#each branches}}
13-
- name: {{ . }}
12+
- name: {{ defaultBranch }}
1413
protection:
14+
required_status_checks: null
15+
enforce_admins: true
1516
required_pull_request_reviews:
16-
required_pull_request_review_count: 1
17-
dismiss_stale_reviews: true
17+
required_approving_review_count: 1
1818
require_code_owner_reviews: true
19+
require_last_push_approval: true
20+
dismiss_stale_reviews: true
1921
restrictions:
20-
teams:
21-
- "npm/cli-team"
22-
enforce_admins: true
23-
required_status_checks: null
24-
{{/each}}
22+
apps: []
23+
users: []
24+
teams: ["cli-team"]

‎tap-snapshots/test/apply/source-snapshots.js.test.cjs

+21-48
Original file line numberDiff line numberDiff line change
@@ -180,26 +180,17 @@ repository:
180180
branches:
181181
- name: main
182182
protection:
183-
required_pull_request_reviews:
184-
required_pull_request_review_count: 1
185-
dismiss_stale_reviews: true
186-
require_code_owner_reviews: true
187-
restrictions:
188-
teams:
189-
- "npm/cli-team"
190-
enforce_admins: true
191183
required_status_checks: null
192-
- name: latest
193-
protection:
184+
enforce_admins: true
194185
required_pull_request_reviews:
195-
required_pull_request_review_count: 1
196-
dismiss_stale_reviews: true
186+
required_approving_review_count: 1
197187
require_code_owner_reviews: true
188+
require_last_push_approval: true
189+
dismiss_stale_reviews: true
198190
restrictions:
199-
teams:
200-
- "npm/cli-team"
201-
enforce_admins: true
202-
required_status_checks: null
191+
apps: []
192+
users: []
193+
teams: [ "cli-team" ]
203194
204195
.github/workflows/audit.yml
205196
========================================
@@ -1625,26 +1616,17 @@ repository:
16251616
branches:
16261617
- name: main
16271618
protection:
1628-
required_pull_request_reviews:
1629-
required_pull_request_review_count: 1
1630-
dismiss_stale_reviews: true
1631-
require_code_owner_reviews: true
1632-
restrictions:
1633-
teams:
1634-
- "npm/cli-team"
1635-
enforce_admins: true
16361619
required_status_checks: null
1637-
- name: latest
1638-
protection:
1620+
enforce_admins: true
16391621
required_pull_request_reviews:
1640-
required_pull_request_review_count: 1
1641-
dismiss_stale_reviews: true
1622+
required_approving_review_count: 1
16421623
require_code_owner_reviews: true
1624+
require_last_push_approval: true
1625+
dismiss_stale_reviews: true
16431626
restrictions:
1644-
teams:
1645-
- "npm/cli-team"
1646-
enforce_admins: true
1647-
required_status_checks: null
1627+
apps: []
1628+
users: []
1629+
teams: [ "cli-team" ]
16481630
16491631
.github/workflows/audit.yml
16501632
========================================
@@ -3346,26 +3328,17 @@ repository:
33463328
branches:
33473329
- name: main
33483330
protection:
3349-
required_pull_request_reviews:
3350-
required_pull_request_review_count: 1
3351-
dismiss_stale_reviews: true
3352-
require_code_owner_reviews: true
3353-
restrictions:
3354-
teams:
3355-
- "npm/cli-team"
3356-
enforce_admins: true
33573331
required_status_checks: null
3358-
- name: latest
3359-
protection:
3332+
enforce_admins: true
33603333
required_pull_request_reviews:
3361-
required_pull_request_review_count: 1
3362-
dismiss_stale_reviews: true
3334+
required_approving_review_count: 1
33633335
require_code_owner_reviews: true
3336+
require_last_push_approval: true
3337+
dismiss_stale_reviews: true
33643338
restrictions:
3365-
teams:
3366-
- "npm/cli-team"
3367-
enforce_admins: true
3368-
required_status_checks: null
3339+
apps: []
3340+
users: []
3341+
teams: [ "cli-team" ]
33693342
33703343
.github/workflows/ci-a.yml
33713344
========================================

0 commit comments

Comments
 (0)
Please sign in to comment.