diff --git a/.github/release-please.yml b/.github/release-please.yml index 5b373038df..007c8df4b6 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -69,3 +69,12 @@ branches: bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java handleGHRelease: true branch: 2.13.x + - releaseType: java-backport + bumpMinorPreMajor: true + extraFiles: + - >- + bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/config/BigtableVersionInfo.java + - >- + bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java + handleGHRelease: true + branch: 2.14.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index fcedacfab9..3f219f1829 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -119,6 +119,20 @@ branchProtectionRules: - cla/google requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true + - pattern: 2.14.x + isAdminEnforced: true + requiredStatusCheckContexts: + - 'Kokoro - Test: Binary Compatibility' + - 'Kokoro - Test: Code Format' + - 'Kokoro - Test: Dependencies' + - 'Kokoro - Test: Integration' + - 'Kokoro - Test: Java 11' + - 'Kokoro - Test: Java 8' + - 'Kokoro - Test: Beam Integration' + - cla/google + - OwlBot Post Processor + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true permissionRules: - team: yoshi-java-admins permission: admin diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 6bf5951621..ba72570c96 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -51,7 +51,7 @@ javadoc) ;; integration) # clean needed when running more than one IT profile - mvn --no-transfer-progress clean verify -B ${INTEGRATION_TEST_ARGS} -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -DskipUnitTests=true + mvn --no-transfer-progress clean verify -B ${INTEGRATION_TEST_ARGS} -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -DskipUnitTests=true -X RETURN_CODE=$? ;; integration-migration)