Merge pull request #875 from microsoftgraph/rsh/supportBranch-protection

Add Support Branch protection

Author: ramsessanchez

.github/policies/msgraph-beta-sdk-java-branch-protection.yml

@@ -45,4 +45,40 @@ configuration:
     restrictsPushes: false
     # Restrict who can dismiss pull request reviews. boolean
     restrictsReviewDismissals: false
+  
+  - branchNamePattern: support/5.x.x
+    # This branch pattern applies to the following branches as of 02/14/2024 12:25
+    # support/5.x.x
 
+    # 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
+    - lint-api-level
+    - CodeQL
+    - build
+    # Require branches to be up to date before merging. This should be false since the repo contains autogenerated files. boolean
+    requiresStrictStatusChecks: false
+    # 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

.github/workflows/api-level-lint.yml

@@ -3,9 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level"
 on: 
   workflow_dispatch:
   push:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
   pull_request:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
 
 jobs:
   lint-api-level:

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
   schedule:
     - cron: '0 1 * * 4'
   workflow_dispatch:

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

@@ -6,10 +6,10 @@ name: PullRequestConflicting
 # events but only for the master branch
 on:
   push:
-    branches: [ master, dev ]
+    branches: [master, dev, support/5.x.x]
   pull_request:
     types: [synchronize]
-    branches: [ master, dev ]
+    branches: [master, dev, support/5.x.x]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

.github/workflows/git-release.yml

@@ -9,6 +9,8 @@ on:
 jobs:
   Git_Release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
       - name: Download Build Artifact

.github/workflows/gradle-build.yml

@@ -2,9 +2,9 @@ name: Gradle Build and Compare Package
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
   pull_request:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
     paths-ignore:
       - '.gradle/wrapper'
       - '.gitignore'

.github/workflows/preview-and-release.yml

@@ -2,7 +2,7 @@ name: Maven Preview and Github Release
 
 on:
   push:
-    branches: [ dev ]
+    branches: [dev, support/5.x.x]
     paths-ignore:
      - '.gradle/wrapper'
      - '.gitignore'

Scripts/incrementMinorVersion.ps1

@@ -54,11 +54,11 @@ function Update-MinorVersionNumber([version]$currentVersion) {
 function Update-MinorVersion() {
 	$readmeFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../README.md"
 	$propertiesFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../gradle.properties"
-	$telemetryFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../src/main/java/com/microsoft/graph/info/Constants.java"
+	$telemetryFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../src/main/java/com/microsoft/graph/beta/info/Constants.java"
 	$currentVersion = Get-CurrentTelemetryVersion -telemetryFilePath $telemetryFilePath
 	$nextVersion = Update-MinorVersionNumber -currentVersion $currentVersion
 	Update-ReadmeVersion -version $nextVersion -readmeFilePath $readmeFilePath
 	Update-TelemetryVersion -version $nextVersion -telemetryFilePath $telemetryFilePath
 	Update-PackageVersion -version $nextVersion -propertiesFilePath $propertiesFilePath
 }
-Update-MinorVersion
+Update-MinorVersion