Skip to content

Commit

Permalink
feat: next release from main branch is 2.2.0 (#596)
Browse files Browse the repository at this point in the history
  • Loading branch information
Neenu1995 authored Oct 18, 2021
1 parent 1279ecb commit 693978a
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 72 deletions.
13 changes: 8 additions & 5 deletions java-core/.github/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
branches:
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
branch: java7

- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
branch: java7
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-backport
branch: 2.1.x
119 changes: 52 additions & 67 deletions java-core/.github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
@@ -1,72 +1,57 @@

# Whether or not rebase-merging is enabled on this repository.
# Defaults to `true`
rebaseMergeAllowed: false

# Whether or not squash-merging is enabled on this repository.
# Defaults to `true`
squashMergeAllowed: true

# Whether or not PRs are merged with a merge commit on this repository.
# Defaults to `false`
mergeCommitAllowed: false

# Rules for main branch protection
branchProtectionRules:
# Identifies the protection rule pattern. Name of the branch to be protected.
# Defaults to `main`
- pattern: main
# Can admins overwrite branch protection.
# Defaults to `true`
isAdminEnforced: true
# Number of approving reviews required to update matching branches.
# Defaults to `1`
requiredApprovingReviewCount: 1
# Are reviews from code owners required to update matching branches.
# Defaults to `false`
requiresCodeOwnerReviews: true
# Require up to date branches
requiresStrictStatusChecks: false
# List of required status check contexts that must pass for commits to be accepted to matching branches.
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- "lint"
- "clirr"
- "units (8)"
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
- "OwlBot Post Processor"
- pattern: java7
# Can admins overwrite branch protection.
# Defaults to `true`
isAdminEnforced: true
# Number of approving reviews required to update matching branches.
# Defaults to `1`
requiredApprovingReviewCount: 1
# Are reviews from code owners required to update matching branches.
# Defaults to `false`
requiresCodeOwnerReviews: true
# Require up to date branches
requiresStrictStatusChecks: false
# List of required status check contexts that must pass for commits to be accepted to matching branches.
requiredStatusCheckContexts:
- "dependencies (8)"
- "dependencies (11)"
- "lint"
- "clirr"
- "units (7)"
- "units (8)"
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
- "OwlBot Post Processor"
# List of explicit permissions to add (additive only)
- pattern: main
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- dependencies (8)
- dependencies (11)
- lint
- clirr
- units (8)
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- OwlBot Post Processor
- pattern: java7
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- dependencies (8)
- dependencies (11)
- lint
- clirr
- units (7)
- units (8)
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- OwlBot Post Processor
- pattern: 2.1.x
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- dependencies (8)
- dependencies (11)
- lint
- clirr
- units (8)
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- OwlBot Post Processor
permissionRules:
- team: yoshi-admins
permission: admin
- team: yoshi-java-admins
permission: admin
- team: yoshi-java
permission: push
- team: yoshi-admins
permission: admin
- team: yoshi-java-admins
permission: admin
- team: yoshi-java
permission: push

0 comments on commit 693978a

Please sign in to comment.