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: configure branch 2.2.x as a release branch #1044

Merged
merged 9 commits into from Oct 25, 2021
Merged

feat: configure branch 2.2.x as a release branch #1044

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
280b5a2
build: configure branch 2.2.x as a release branch
kolea2 Oct 25, 2021
a55d4ed
test
kolea2 Oct 25, 2021
08a9964
test
kolea2 Oct 25, 2021
ecccd00
test
kolea2 Oct 25, 2021
7593b69
test
kolea2 Oct 25, 2021
16ed982
test
kolea2 Oct 25, 2021
612828a
test
kolea2 Oct 25, 2021
ced95e1
Merge branch 'main' of github.com:googleapis/java-bigtable into relea…
kolea2 Oct 25, 2021
704bfd2
revert
kolea2 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
7 changes: 7 additions & 0 deletions .github/release-please.yml
View file
Open in desktop
Expand Up @@ -16,5 +16,12 @@ branches:
- >-
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
branch: java7
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-backport
extraFiles:
- >-
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
branch: 2.2.x
extraFiles:
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
14 changes: 14 additions & 0 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Expand Up @@ -44,6 +44,20 @@ branchProtectionRules:
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- pattern: 2.2.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
12 changes: 6 additions & 6 deletions .kokoro/dependencies.sh
View file
Open in desktop
Expand Up @@ -38,19 +38,19 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

case $javaVersion in
"17")
if [[ $javaVersion == 17* ]]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this still relevant?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can either wait for the upstream synthtool change or just merge in as is. I was testing here first before making googleapis/synthtool#1266

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)

echo $MAVEN_OPTS

# this should run maven enforcer
retry_with_backoff 3 10 \
mvn install -B -V -ntp \
Expand Down