From 8f6e6b3fd7c7ea9705bff9d8cccba9267c1aa892 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 20 Apr 2021 09:36:02 -0700 Subject: [PATCH] chore: Re-generated to pick up changes from synthtool (#740) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: typo @Neenu1995 Source-Author: Elliotte Rusty Harold Source-Date: Tue Apr 13 00:00:05 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 082e1ca0863b13ada8594fe91845380765da5b70 Source-Link: https://github.com/googleapis/synthtool/commit/082e1ca0863b13ada8594fe91845380765da5b70 * fix: release scripts from issuing overlapping phases `mvn deploy` will run `mvn install` so specifying `mvn install deploy` is redundant at best. At worst, it will cause plugins like maven-shade-plugin to be executed twice re-shading itself Source-Author: Igor Bernstein Source-Date: Wed Apr 14 13:16:03 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d Source-Link: https://github.com/googleapis/synthtool/commit/8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d --- .github/release-please.yml | 4 +--- .kokoro/build.sh | 2 +- .kokoro/release/snapshot.sh | 2 +- .kokoro/release/stage.sh | 2 +- codecov.yaml | 12 ------------ synth.metadata | 5 +++-- 6 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 7442886ff0..dce2c84509 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,4 +1,2 @@ releaseType: java-yoshi -bumpMinorPreMajor: true -extraFiles: - - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/ClientVersion.java +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index de7cbfae7c..a26c201b20 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a737..1f55b77024 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2eb5..8a1033843c 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/codecov.yaml b/codecov.yaml index d863ea74aa..5724ea9478 100644 --- a/codecov.yaml +++ b/codecov.yaml @@ -2,15 +2,3 @@ codecov: ci: - source.cloud.google.com - -# exclude all autogenerated code -ignore: - - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/*/v2/BaseBigtable*.java - - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/*/v2/stub/GrpcBigtable*Stub.java - - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/*/v2/stub/GrpcBigtable*CallableFactory.java - - grpc-google-cloud-bigtable-admin-v2 - - proto-google-cloud-bigtable-admin-v2 - - grpc-google-cloud-bigtable-v2 - - proto-google-cloud-bigtable-v2 - - .kokoro - - .github diff --git a/synth.metadata b/synth.metadata index 51ad79f364..08240b29c8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "67ef15591d49d51728c769eb54a1167b15524aa1" + "sha": "b3bb7f77610e48e849766a6e9dbacb98fc3f9811" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ], @@ -53,6 +53,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml",