Skip to content

Commit

Permalink
Merge branch 'main' into shem/batch_requests
Browse files Browse the repository at this point in the history
  • Loading branch information
shemogumbe authored Sep 9, 2024
2 parents 63a1048 + b917d8c commit 7f74696
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 43 deletions.
37 changes: 0 additions & 37 deletions .github/policies/msgraph-sdk-python-core-branch-protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,6 @@ resource: repository
configuration:
branchProtectionRules:

- branchNamePattern: dev
# This branch pattern applies to the following branches as of 06/12/2023 11:37:28:
# dev

# Specifies whether this branch can be deleted. boolean
allowsDeletions: false
# Specifies whether forced pushes are allowed on this branch. boolean
allowsForcePushes: false
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
dismissStaleReviews: true
# Specifies whether admins can overwrite branch protection. boolean
isAdminEnforced: false
# Indicates whether "Require a pull request before merging" is enabled. boolean
requiresPullRequestBeforeMerging: true
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: true
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: true
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any
# existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
- CodeQL
- check-build-matrix
- license/cla
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
restrictsReviewDismissals: false

- branchNamePattern: main
# This branch pattern applies to the following branches as of 01/12/2024 13:14:28:
# main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [main]
pull_request:
branches: [main, dev]
branches: [main]
workflow_call:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [main, dev]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [main, dev]
branches: [main]
schedule:
- cron: "32 11 * * 6"

Expand Down Expand Up @@ -66,4 +66,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/conflicting-pr-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: PullRequestConflicting
# events but only for the master branch
on:
push:
branches: [main, dev]
branches: [main]
pull_request:
types: [synchronize]
branches: [main, dev]
branches: [main]

permissions:
pull-requests: write
Expand Down

0 comments on commit 7f74696

Please sign in to comment.