Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: next release from mainline is 2.2.0 #1124

Merged
merged 2 commits into from Oct 25, 2021
Merged

feat: next release from mainline is 2.2.0 #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ab3d3
feat: next release from mainline is 2.2.0
BenWhitehead Oct 25, 2021
cbc7436
fix(java): java 17 dependency arguments
BenWhitehead Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/release-please.yml
View file
Open in desktop
Expand Up @@ -18,3 +18,7 @@ branches:
handleGHRelease: true
releaseType: java-yoshi
branch: java7
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
branch: 2.1.x
14 changes: 14 additions & 0 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Expand Up @@ -76,6 +76,20 @@ branchProtectionRules:
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- 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
permissionRules:
- team: yoshi-admins
permission: admin
Expand Down
10 changes: 4 additions & 6 deletions .kokoro/dependencies.sh
View file
Open in desktop
Expand Up @@ -38,15 +38,13 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

case $javaVersion in
"17")
if [[ $javaVersion == 17* ]]
then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
;;
*)
else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
;;
esac
fi
}

export MAVEN_OPTS=$(determineMavenOpts)
Expand Down