Skip to content

Commit

Permalink
chore: Re-generated to pick up changes from synthtool (#740)
Browse files Browse the repository at this point in the history
* 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 <elharo@users.noreply.github.com>
Source-Date: Tue Apr 13 00:00:05 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 082e1ca0863b13ada8594fe91845380765da5b70
Source-Link: googleapis/synthtool@082e1ca

* 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 <igorbernstein@google.com>
Source-Date: Wed Apr 14 13:16:03 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d
Source-Link: googleapis/synthtool@8285c2b
  • Loading branch information
yoshi-automation authored Apr 20, 2021
1 parent cfdd0cd commit 8f6e6b3
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
releaseType: java-yoshi
bumpMinorPreMajor: true
extraFiles:
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/ClientVersion.java
bumpMinorPreMajor: true
2 changes: 1 addition & 1 deletion .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/stage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 0 additions & 12 deletions codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-bigtable.git",
"sha": "67ef15591d49d51728c769eb54a1167b15524aa1"
"sha": "b3bb7f77610e48e849766a6e9dbacb98fc3f9811"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
"sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
}
}
],
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 8f6e6b3

Please sign in to comment.