Skip to content

Commit 8a6eb7d

Browse files
committed
Change default branch to main
1 parent 388c528 commit 8a6eb7d

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

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

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

12-
- branchNamePattern: dev
12+
- branchNamePattern: main
1313
# This branch pattern applies to the following branches as of 06/09/2023 14:08:44:
1414
# dev
1515

@@ -45,7 +45,7 @@ configuration:
4545
restrictsPushes: false
4646
# Restrict who can dismiss pull request reviews. boolean
4747
restrictsReviewDismissals: false
48-
48+
4949
- branchNamePattern: support/5.x.x
5050
# This branch pattern applies to the following branches as of 02/14/2024 12:25
5151
# support/5.x.x

.github/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
manifest: true
2-
primaryBranch: dev
2+
primaryBranch: main
33
handleGHRelease: true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: "Checks the SDK only using APIs from the targeted API level"
22

3-
on:
3+
on:
44
workflow_dispatch:
55
push:
6-
branches: [dev, support/5.x.x]
6+
branches: [main, support/5.x.x]
77
pull_request:
8-
branches: [dev, support/5.x.x]
8+
branches: [main, support/5.x.x]
99

1010
jobs:
1111
lint-api-level:

.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/codeql-analysis.yml

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

1414
on:
1515
push:
16-
branches: [dev, support/5.x.x]
16+
branches: [main, support/5.x.x]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [dev, support/5.x.x]
19+
branches: [main, support/5.x.x]
2020
schedule:
2121
- cron: '0 1 * * 4'
2222
workflow_dispatch:
@@ -60,7 +60,7 @@ jobs:
6060
#init-heap: 1024M # Initial heap size
6161
#max-heap: 4096M # Maximum heap size
6262
ram: 4096
63-
63+
6464
# If you wish to specify custom queries, you can do so here or in a config file.
6565
# By default, queries listed here will override any specified in a config file.
6666
# Prefix the list here with "+" to use these queries and those in the config file.
@@ -84,7 +84,7 @@ jobs:
8484
run: chmod +x gradlew
8585
- name: Build #with Gradle
8686
run: gradle clean build "-Dorg.gradle.jvmargs=-Xmx4g -Xms1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
87-
87+
8888
- name: Perform CodeQL Analysis
8989
uses: github/codeql-action/analyze@v3
9090
with:

.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: [dev, support/5.x.x]
9+
branches: [main, support/5.x.x]
1010
pull_request:
1111
types: [synchronize]
12-
branches: [dev, support/5.x.x]
12+
branches: [main, support/5.x.x]
1313

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

.github/workflows/gradle-build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Gradle Build and Compare Package
22

33
on:
44
push:
5-
branches: [dev, support/5.x.x]
5+
branches: [main, support/5.x.x]
66
pull_request:
7-
branches: [dev, support/5.x.x]
7+
branches: [main, support/5.x.x]
88
workflow_dispatch:
99

1010
jobs:
@@ -47,14 +47,14 @@ jobs:
4747
gradle.properties
4848
**/gradle/**
4949
Scripts/**
50-
50+
5151
compare-packages:
52-
needs: build
52+
needs: build
5353
runs-on: ubuntu-latest
54-
env:
54+
env:
5555
CURRENT_PKG_DIFF: ./artifacts/current/build/libs/msgraph-beta-sdk-java.jar
5656
PRIOR_PKG_DIFF: ./artifacts/previous/build/libs/msgraph-beta-sdk-java.jar
57-
steps:
57+
steps:
5858
- uses: actions/checkout@v4
5959
- name: Set up JDK
6060
uses: actions/setup-java@v4
@@ -64,22 +64,22 @@ jobs:
6464
cache: gradle
6565
- name: Download Current Build
6666
uses: actions/download-artifact@v4
67-
with:
67+
with:
6868
name: drop
6969
path: artifacts/current/
7070
- name: Download Last Successful Build
7171
uses: dawidd6/action-download-artifact@v3.1.4
72-
with:
72+
with:
7373
workflow: preview-and-release.yml
7474
workflow_conclusion: success
7575
branch: dev
7676
event: push
7777
name: drop
7878
path: artifacts/previous/
79-
- name: Run PKG Diff
79+
- name: Run PKG Diff
8080
continue-on-error: true
8181
run: |
82-
sudo apt install pkgdiff
82+
sudo apt install pkgdiff
8383
pkgdiff -hide-unchanged ${{ env.PRIOR_PKG_DIFF }} ${{ env.CURRENT_PKG_DIFF }}
8484
- name: Upload Diff Artifact
8585
if: ${{ always() }}

0 commit comments

Comments
 (0)