From 280b5a207930f6b37d9a75d703aa1feac7ec5d0f Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Mon, 25 Oct 2021 09:55:45 -0400 Subject: [PATCH 1/8] build: configure branch 2.2.x as a release branch --- .github/release-please.yml | 7 +++++++ .github/sync-repo-settings.yaml | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 66e70c4434..e31f046214 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -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 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index a9131e4d44..e1df1503e6 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -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 From a55d4ed0589cc862e2ff2dac95fe7576af12f8c1 Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:22:01 -0400 Subject: [PATCH 2/8] test --- .kokoro/dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7eb..3c24712c89 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,6 +38,8 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) + echo $javaVersion + case $javaVersion in "17") # MaxPermSize is no longer supported as of jdk 17 From 08a9964e69622e3a82a63038c9e7541859ca9022 Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:23:20 -0400 Subject: [PATCH 3/8] test --- .kokoro/dependencies.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 3c24712c89..9a5105d7eb 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,8 +38,6 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - echo $javaVersion - case $javaVersion in "17") # MaxPermSize is no longer supported as of jdk 17 From ecccd003884c5e993dc0ee6578a1f16bb084c5cb Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:30:11 -0400 Subject: [PATCH 4/8] test --- .kokoro/dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7eb..f0a6cf6238 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -51,6 +51,8 @@ function determineMavenOpts() { export MAVEN_OPTS=$(determineMavenOpts) +echo $MAVEN_OPTS + # this should run maven enforcer retry_with_backoff 3 10 \ mvn install -B -V -ntp \ From 7593b69b413d284ae35ab7cec7267b5c85cf5ebe Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:42:33 -0400 Subject: [PATCH 5/8] test --- .kokoro/dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index f0a6cf6238..d27f6ef50d 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,15 @@ 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) From 16ed982cd99d9b375602b4e7a4ae3e873f580dfd Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:43:48 -0400 Subject: [PATCH 6/8] test --- .kokoro/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index d27f6ef50d..c182409741 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,7 +38,7 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - if [[$javaVersion == 17*]] + if [[ $javaVersion == 17* ]] then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" From 612828a6ec78ab712ff76ad1d3ad6764b52e2441 Mon Sep 17 00:00:00 2001 From: kolea2 Date: Mon, 25 Oct 2021 10:44:45 -0400 Subject: [PATCH 7/8] test --- .kokoro/dependencies.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index c182409741..94b1326e0b 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -42,10 +42,8 @@ function determineMavenOpts() { then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; fi } From 704bfd2058af7f5c4a49e29a60b9e6d96c6eea29 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Mon, 25 Oct 2021 18:55:53 -0400 Subject: [PATCH 8/8] revert --- .kokoro/dependencies.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 94b1326e0b..d7476cfe97 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -49,8 +49,6 @@ function determineMavenOpts() { export MAVEN_OPTS=$(determineMavenOpts) -echo $MAVEN_OPTS - # this should run maven enforcer retry_with_backoff 3 10 \ mvn install -B -V -ntp \