diff --git a/.azure-pipelines/common-templates/create-pr.yml b/.azure-pipelines/common-templates/create-pr.yml index 337a46b5b5e..7c572b93c23 100644 --- a/.azure-pipelines/common-templates/create-pr.yml +++ b/.azure-pipelines/common-templates/create-pr.yml @@ -4,7 +4,7 @@ parameters: - name: BaseBranch type: string - default: dev + default: main - name: TargetBranch type: string default: "" diff --git a/.github/policies/msgraph-sdk-powershell-branch-protection.yml b/.github/policies/msgraph-sdk-powershell-branch-protection.yml index 0c38b5eb273..f640f3571ab 100644 --- a/.github/policies/msgraph-sdk-powershell-branch-protection.yml +++ b/.github/policies/msgraph-sdk-powershell-branch-protection.yml @@ -9,41 +9,6 @@ resource: repository configuration: branchProtectionRules: - - branchNamePattern: dev - # This branch pattern applies to the following branches as of approximately 08/25/2023 14:07:25: - # 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: - - license/cla - - GitOps/AdvancedSecurity - # 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: features/[0-9]* # This branch pattern applies to the following branches as of approximately 08/25/2023 14:07:25: # features/2.0 @@ -104,6 +69,7 @@ configuration: 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: + - license/cla - GitOps/AdvancedSecurity # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean requiresStrictStatusChecks: true diff --git a/.github/workflows/metadatachanges.yml b/.github/workflows/metadatachanges.yml index d91394e2ecf..687f9db9bf6 100644 --- a/.github/workflows/metadatachanges.yml +++ b/.github/workflows/metadatachanges.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: pull_request: branches: - - dev + - main paths: - openApiDocs/** - src/Authentication/Authentication/custom/common/MgCommandMetadata.json diff --git a/.github/workflows/project-auto-add.yml b/.github/workflows/project-auto-add.yml index 5440a81e906..50bed073237 100644 --- a/.github/workflows/project-auto-add.yml +++ b/.github/workflows/project-auto-add.yml @@ -9,7 +9,7 @@ on: types: - opened branches: - - "dev" + - "main" jobs: track_issue: