Skip to content

Commit b917d8c

Browse files
authored
Merge pull request #684 from microsoftgraph/bugfix/dev-branch
ci: removes outdated branch policy for dev branch
2 parents ef3c8b4 + ebef043 commit b917d8c

File tree

4 files changed

+6
-43
lines changed

4 files changed

+6
-43
lines changed

.github/policies/msgraph-sdk-python-core-branch-protection.yml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,6 @@ resource: repository
77
configuration:
88
branchProtectionRules:
99

10-
- branchNamePattern: dev
11-
# This branch pattern applies to the following branches as of 06/12/2023 11:37:28:
12-
# dev
13-
14-
# Specifies whether this branch can be deleted. boolean
15-
allowsDeletions: false
16-
# Specifies whether forced pushes are allowed on this branch. boolean
17-
allowsForcePushes: false
18-
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
19-
dismissStaleReviews: true
20-
# Specifies whether admins can overwrite branch protection. boolean
21-
isAdminEnforced: false
22-
# Indicates whether "Require a pull request before merging" is enabled. boolean
23-
requiresPullRequestBeforeMerging: true
24-
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
25-
requiredApprovingReviewsCount: 1
26-
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
27-
requireCodeOwnersReview: true
28-
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
29-
requiresCommitSignatures: false
30-
# Are conversations required to be resolved before merging? boolean
31-
requiresConversationResolution: true
32-
# Are merge commits prohibited from being pushed to this branch. boolean
33-
requiresLinearHistory: false
34-
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any
35-
# existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
36-
requiredStatusChecks:
37-
- CodeQL
38-
- check-build-matrix
39-
- license/cla
40-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
41-
requiresStrictStatusChecks: true
42-
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
43-
restrictsPushes: false
44-
# Restrict who can dismiss pull request reviews. boolean
45-
restrictsReviewDismissals: false
46-
4710
- branchNamePattern: main
4811
# This branch pattern applies to the following branches as of 01/12/2024 13:14:28:
4912
# main

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
push:
88
branches: [main]
99
pull_request:
10-
branches: [main, dev]
10+
branches: [main]
1111
workflow_call:
1212

1313
jobs:

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [main, dev]
16+
branches: [main]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [main, dev]
19+
branches: [main]
2020
schedule:
2121
- cron: "32 11 * * 6"
2222

@@ -66,4 +66,4 @@ jobs:
6666
# ./location_of_script_within_repo/buildscript.sh
6767

6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@v3
69+
uses: github/codeql-action/analyze@v3

.github/workflows/conflicting-pr-label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ name: PullRequestConflicting
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [main, dev]
9+
branches: [main]
1010
pull_request:
1111
types: [synchronize]
12-
branches: [main, dev]
12+
branches: [main]
1313

1414
permissions:
1515
pull-requests: write

0 commit comments

Comments
 (0)