Skip to content

Commit 2359b8d

Browse files
baywetbaywet
authored
Merge pull request #1614 from microsoftgraph/chore/master-to-main
Make `main` the default branch
2 parents e4d7342 + 4ea0465 commit 2359b8d

13 files changed

+42
-85
lines changed

‎.github/policies/msgraph-sdk-java-core-branch-protection.yml‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,9 @@ resource: repository
99
configuration:
1010
branchProtectionRules:
1111

12-
- branchNamePattern: dev
13-
# This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
14-
# dev
15-
16-
# Specifies whether this branch can be deleted. boolean
17-
allowsDeletions: false
18-
# Specifies whether forced pushes are allowed on this branch. boolean
19-
allowsForcePushes: false
20-
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
21-
dismissStaleReviews: true
22-
# Specifies whether admins can overwrite branch protection. boolean
23-
isAdminEnforced: false
24-
# Indicates whether "Require a pull request before merging" is enabled. boolean
25-
requiresPullRequestBeforeMerging: true
26-
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
27-
requiredApprovingReviewsCount: 1
28-
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
29-
requireCodeOwnersReview: true
30-
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
31-
requiresCommitSignatures: false
32-
# Are conversations required to be resolved before merging? boolean
33-
requiresConversationResolution: true
34-
# Are merge commits prohibited from being pushed to this branch. boolean
35-
requiresLinearHistory: false
36-
# 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
37-
requiredStatusChecks:
38-
- license/cla
39-
- Build
40-
- lint-api-level
41-
- Analyze (java)
42-
- build
43-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
44-
requiresStrictStatusChecks: true
45-
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
46-
restrictsPushes: false
47-
# Restrict who can dismiss pull request reviews. boolean
48-
restrictsReviewDismissals: false
49-
50-
- branchNamePattern: master
51-
# This branch pattern applies to the following branches as of 06/12/2023 10:31:16:
52-
# master
12+
- branchNamePattern: main
13+
# This branch pattern applies to the following branches as of 20/05/2024 10:31:16:
14+
# main
5315

5416
# Specifies whether this branch can be deleted. boolean
5517
allowsDeletions: false

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level"
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [dev, master, support/2.x.x]
6+
branches: [main, support/2.x.x]
77
pull_request:
8-
branches: [dev, master, support/2.x.x]
8+
branches: [main, support/2.x.x]
99

1010
jobs:
1111
lint-api-level:
@@ -31,4 +31,4 @@ jobs:
3131
with:
3232
name: lint-report
3333
path: ./android/build/reports
34-
34+

‎.github/workflows/auto-merge-dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Auto-merge dependabot updates
22

33
on:
44
pull_request:
5-
branches: [ dev ]
5+
branches: [ main ]
66

77
permissions:
88
pull-requests: write

‎.github/workflows/build-and-publish.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ name: Build and Publish
22

33
on:
44
push:
5-
branches: [dev, master, support/2.x.x]
5+
branches: [main, support/2.x.x]
66
paths-ignore:
77
- '.gradle/wrapper'
88
- '.gitignore'
99
- 'LICENSE'
1010
- 'THIRD PARTY NOTICES'
1111
- '*.md'
12-
env:
12+
env:
1313
PREVIEW_TASK: publishSnapshotPublicationToSonatypeSnapshotRepository
1414
PUBLISH_TASK: publishMavenCentralReleasePublicationToSonatypeRepository
15-
15+
1616
jobs:
1717
maven_Preview:
18-
if: ${{ github.ref == 'refs/heads/dev' }}
19-
environment:
18+
if: ${{ github.ref == 'refs/heads/main' }}
19+
environment:
2020
name: maven_central_snapshot
2121
runs-on: ubuntu-latest
2222
steps:
@@ -32,23 +32,23 @@ jobs:
3232
- name: Download file
3333
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
3434
shell: pwsh
35-
env:
35+
env:
3636
ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }}
37-
OUTPUT_PATH: '.\local.properties'
37+
OUTPUT_PATH: '.\local.properties'
3838
- name: Download file
3939
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
4040
shell: pwsh
41-
env:
41+
env:
4242
ENCODED_VALUE: ${{ secrets.SECRING_GPG }}
4343
OUTPUT_PATH: '.\secring.gpg'
4444
- name: Grant execute permission for gradlew
4545
run: chmod +x gradlew
4646
- name: Publish
4747
run: ./gradlew $PREVIEW_TASK
48-
48+
4949
maven_Release:
50-
if: ${{ github.ref == 'refs/heads/master' }}
51-
environment:
50+
if: ${{ github.ref == 'refs/heads/main' }}
51+
environment:
5252
name: maven_central_release
5353
runs-on: ubuntu-latest
5454
steps:
@@ -64,13 +64,13 @@ jobs:
6464
- name: Download file
6565
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
6666
shell: pwsh
67-
env:
67+
env:
6868
ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }}
6969
OUTPUT_PATH: '.\local.properties'
7070
- name: Download file
7171
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
7272
shell: pwsh
73-
env:
73+
env:
7474
ENCODED_VALUE: ${{ secrets.SECRING_GPG }}
7575
OUTPUT_PATH: '.\secring.gpg'
7676
- name: Grant execute permission for gradlew
@@ -92,7 +92,7 @@ jobs:
9292
gradle.properties
9393
**/gradle/**
9494
Scripts/**
95-
95+
9696
create_Tag:
9797
needs: maven_Release
9898
runs-on: ubuntu-latest
@@ -117,4 +117,4 @@ jobs:
117117
token: ${{ secrets.PERSONAL_TOKEN }}
118118
ref: ${{ steps.GetVersion.outputs.tag }}
119119

120-
120+

‎.github/workflows/codeql-analysis.yml‎

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

1414
on:
1515
push:
16-
branches: [dev, master, support/2.x.x]
16+
branches: [main, support/2.x.x]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [dev, support/2.x.x]
19+
branches: [main, support/2.x.x]
2020
schedule:
2121
- cron: '0 1 * * 4'
2222
workflow_dispatch:
2323

2424
jobs:
2525
analyze:
2626
name: Analyze
27-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
28-
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
27+
runs-on: 'ubuntu-latest'
28+
timeout-minutes: 10
2929
permissions:
3030
actions: read
3131
contents: read

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ name: PullRequestConflicting
77
on:
88
workflow_dispatch:
99
push:
10-
branches: [master, dev, support/2.x.x]
10+
branches: [main, support/2.x.x]
1111
pull_request:
1212
types: [synchronize]
13-
branches: [master, dev, support/2.x.x]
13+
branches: [main, support/2.x.x]
1414

1515
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1616
jobs:

‎.github/workflows/git-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
tags:
66
- "v[0-9]+.[0-9]+.[0-9]+"
77
workflow_dispatch:
8-
8+
99
jobs:
1010
Git_Release:
1111
runs-on: ubuntu-latest
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
workflow: build-and-publish.yml
2020
workflow_conclusion: success
21-
branch: master
21+
branch: main
2222
event: push
2323
name: drop
2424
path: drop

‎.github/workflows/gradle-build.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@ name: Java CI with Gradle
22

33
on:
44
pull_request:
5-
branches: [dev, master, support/2.x.x]
6-
paths-ignore:
7-
- '.gradle/wrapper'
8-
- '.gitignore'
9-
- 'LICENSE'
10-
- 'THIRD PARTY NOTICES'
11-
- '*.md'
12-
workflow_dispatch:
13-
5+
branches: [main, support/2.x.x]
6+
workflow_dispatch:
7+
148
jobs:
159
build:
1610
runs-on: ubuntu-latest
@@ -21,7 +15,7 @@ jobs:
2115
with:
2216
java-version: 20
2317
distribution: 'temurin'
24-
cache: gradle
18+
cache: gradle
2519
- name: Easy detect-secrets
2620
uses: RobertFischer/[email protected]
2721
- name: Grant execute permission for gradlew

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Static analysis with SonarCloud
22
on:
33
workflow_dispatch:
44
push:
5-
branches: [master, dev, support/2.x.x]
5+
branches: [main, support/2.x.x]
66
pull_request:
77
types: [opened, synchronize, reopened]
88

@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
java-version: 20
3636
distribution: 'temurin'
37-
cache: gradle
37+
cache: gradle
3838
- name: Cache SonarCloud packages
3939
uses: actions/cache@v4
4040
with:

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Resources:
77
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
88
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
99
- Contact [[email protected]](mailto:[email protected]) with questions or concerns
10+
- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

0 commit comments

Comments
 (0)