Skip to content

Commit

Permalink
Merge pull request #2006 from microsoftgraph/chore/default-to-main
Browse files Browse the repository at this point in the history
Change default branch to main
  • Loading branch information
baywet authored May 20, 2024
2 parents 5b63a56 + e1fe9ee commit 119d0f9
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/policies/msgraph-sdk-java-branch-protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource: repository
configuration:
branchProtectionRules:

- branchNamePattern: dev
- branchNamePattern: main
# This branch pattern applies to the following branches as of 06/12/2023 10:31:15:
# dev

Expand Down
2 changes: 1 addition & 1 deletion .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
manifest: true
primaryBranch: dev
primaryBranch: main
handleGHRelease: true
6 changes: 3 additions & 3 deletions .github/workflows/api-level-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: "Checks the SDK only using APIs from the targeted API level"
on:
workflow_dispatch:
push:
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]
pull_request:
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]

jobs:
lint-api-level:
Expand All @@ -30,4 +30,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: lint-report
path: ./android/build/reports
path: ./android/build/reports
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Auto-merge dependabot updates

on:
pull_request:
branches: [ dev ]
branches: [ main ]

permissions:
pull-requests: write
Expand Down
4 changes: 2 additions & 2 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: [dev, support/5.x.x]
branches: [main, support/5.x.x]
pull_request:
# The branches below must be a subset of the branches above
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]
schedule:
- cron: '0 1 * * 4'
workflow_dispatch:
Expand Down
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: [dev, support/5.x.x]
branches: [main, support/5.x.x]
pull_request:
types: [synchronize]
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Gradle Build and Compare Package

on:
push:
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]
pull_request:
branches: [dev, support/5.x.x]
branches: [main, support/5.x.x]
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -47,14 +47,14 @@ jobs:
gradle.properties
**/gradle/**
Scripts/**
compare-packages:
needs: build
runs-on: ubuntu-latest
env:
env:
CURRENT_PKG_DIFF: ./artifacts/current/build/libs/msgraph-sdk-java.jar
PRIOR_PKG_DIFF: ./artifacts/previous/build/libs/msgraph-sdk-java.jar
steps:
steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
Expand All @@ -64,22 +64,22 @@ jobs:
cache: gradle
- name: Download Current Build
uses: actions/download-artifact@v4
with:
with:
name: drop
path: artifacts/current/
- name: Download Last Successful Build
uses: dawidd6/[email protected]
with:
with:
workflow: preview-and-release.yml
workflow_conclusion: success
branch: dev
event: push
name: drop
path: artifacts/previous/
- name: Run PKG Diff
- name: Run PKG Diff
continue-on-error: true
run: |
sudo apt install pkgdiff
sudo apt install pkgdiff
pkgdiff -hide-unchanged ${{ env.PRIOR_PKG_DIFF }} ${{ env.CURRENT_PKG_DIFF }}
- name: Upload Diff Artifact
if: ${{ always() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Maven Preview/Release and Github Release

on:
push:
branches: [dev]
branches: [main]
paths-ignore:
- '.gradle/wrapper'
- '.gitignore'
Expand All @@ -19,7 +19,7 @@ env:

jobs:
maven_Preview:
if: ${{ github.ref == 'refs/heads/dev' }}
if: ${{ github.ref == 'refs/heads/main' }}
environment:
name: maven_central_snapshot
runs-on: ubuntu-latest
Expand Down

0 comments on commit 119d0f9

Please sign in to comment.