Skip to content

Commit

Permalink
chore: Re-generated to pick up changes from synthtool (#129)
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.

* chore: remove staging bucket v2

not needed since we removed v2 solution - googleapis/synthtool#964

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Mon Mar 29 14:47:37 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 572ef8f70edd9041f5bcfa71511aed6aecfc2098
Source-Link: googleapis/synthtool@572ef8f

* build(java): skip javadoc tests during dependencies test

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Fri Apr 9 09:18:54 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 5b0e1592dd7d70b485e157ea4b3eb1704ecbd015
Source-Link: googleapis/synthtool@5b0e159

* 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

* chore: adding cloud-rad java xrefs

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Thu May 6 11:48:47 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 046994f491c02806aea60118e214a9edd67f5ab7
Source-Link: googleapis/synthtool@046994f

* build(java): remove codecov action

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Thu May 13 11:05:41 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1
Source-Link: googleapis/synthtool@4f4b1b9

* chore: add changelog to cloud-rad

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Mon May 17 09:54:56 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: c86c7a60985644eab557949363a38301d40d78d2
Source-Link: googleapis/synthtool@c86c7a6

* feat: add `gcf-owl-bot[bot]` to `ignoreAuthors`

* feat: add `gcf-owl-bot[bot]` to `ignoreAuthors`

Related: googleapis/repo-automation-bots#1751

* feat: add `yoshi-automation` to `ignoreAuthors`

Source-Author: Daniel Bankhead <danielbankhead@google.com>
Source-Date: Tue May 18 15:08:47 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 7332178a11ddddc91188dc0f25bca1ccadcaa6c6
Source-Link: googleapis/synthtool@7332178

* chore: dump maven version along with java

Source-Author: Igor Bernstein <igorbernstein@google.com>
Source-Date: Thu May 20 10:56:02 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 8eae0234a16b26c2ff616d305dbd9786c8b10a47
Source-Link: googleapis/synthtool@8eae023

* fix: Update dependencies.sh to not break on mac

Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Source-Date: Tue Jun 15 14:06:42 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 8f76a885deaaf2fe234daeba4a8cc4d1b3de8086
Source-Link: googleapis/synthtool@8f76a88

* chore: minimize noise from build scripts

This should limit the amount of scrolling client devs have to do when debugging a test failure

Co-authored-by: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>

Source-Author: Igor Bernstein <igorbernstein@google.com>
Source-Date: Fri Jun 18 17:28:07 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 1c0c698705e668ccb3d68556ae7260f16ce63a6e
Source-Link: googleapis/synthtool@1c0c698

* fix: Add `shopt -s nullglob` to dependencies script

This prevents processing the unexpanded glob "**/.flattened-pom.xml" in repos which do not flatten any POMs.

Source-Author: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Source-Date: Sat Jun 19 18:35:58 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 87254ac89a9559864c0a245d6b150406439ce3d8
Source-Link: googleapis/synthtool@87254ac
  • Loading branch information
yoshi-automation committed Aug 19, 2021
1 parent cba6cff commit 030d3d8
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 21 deletions.
1 change: 1 addition & 0 deletions .github/generated-files-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ ignoreAuthors:
- 'renovate-bot'
- 'yoshi-automation'
- 'release-please[bot]'
- 'gcf-owl-bot[bot]'
3 changes: 2 additions & 1 deletion .github/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-yoshi
bumpMinorPreMajor: true
6 changes: 1 addition & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
- run: .kokoro/build.sh
env:
JOB_TYPE: test
- name: coverage
uses: codecov/codecov-action@v1
with:
name: actions ${{matrix.java}}
windows:
runs-on: windows-latest
steps:
Expand Down Expand Up @@ -80,4 +76,4 @@ jobs:
- run: java -version
- run: .kokoro/build.sh
env:
JOB_TYPE: clirr
JOB_TYPE: clirr
6 changes: 3 additions & 3 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cd ${scriptDir}/..
# include common functions
source ${scriptDir}/common.sh

# Print out Java version
java -version
# Print out Maven & Java version
mvn -version
echo ${JOB_TYPE}

# attempt to install 3 times with exponential backoff (starting with 10 seconds)
Expand All @@ -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
1 change: 0 additions & 1 deletion .kokoro/coerce_logs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${job}/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
Expand Down
6 changes: 4 additions & 2 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# limitations under the License.

set -eo pipefail
shopt -s nullglob

## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
Expand All @@ -33,6 +34,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
retry_with_backoff 3 10 \
mvn install -B -V -ntp \
-DskipTests=true \
-Dmaven.javadoc.skip=true \
-Dclirr.skip=true

mvn -B dependency:analyze -DfailOnWarning=true
Expand All @@ -45,7 +47,7 @@ function completenessCheck() {
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt

# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
Expand All @@ -69,7 +71,7 @@ function completenessCheck() {
set +e

error_count=0
for path in $(find -name ".flattened-pom.xml")
for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
Expand Down
5 changes: 0 additions & 5 deletions .kokoro/release/publish_javadoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
exit 1
fi

if [[ -z "${STAGING_BUCKET_V2}" ]]; then
echo "Need to set STAGING_BUCKET_V2 environment variable"
exit 1
fi

# work from the git root directory
pushd $(dirname "$0")/../../

Expand Down
9 changes: 9 additions & 0 deletions .kokoro/release/publish_javadoc11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,22 @@ mvn clean site -B -q -P docFX

# copy README to docfx-yml dir and rename index.md
cp README.md target/docfx-yml/index.md
# copy CHANGELOG to docfx-yml dir and rename history.md
cp CHANGELOG.md target/docfx-yml/history.md

pushd target/docfx-yml

# create metadata
python3 -m docuploader create-metadata \
--name ${NAME} \
--version ${VERSION} \
--xrefs devsite://java/gax \
--xrefs devsite://java/google-cloud-core \
--xrefs devsite://java/api-common \
--xrefs devsite://java/proto-google-common-protos \
--xrefs devsite://java/google-api-client \
--xrefs devsite://java/google-http-client \
--xrefs devsite://java/protobuf \
--language java

# upload yml to production bucket
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
6 changes: 4 additions & 2 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-gcloud-maven-plugin.git",
"sha": "4cf51852779c55b4dd9f5e636b4227c0ab053ae1"
"sha": "0cae6e387f10493fc7bad88b1a6b5aa57076b5c0"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef"
"sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
}
}
],
Expand All @@ -26,6 +26,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 Expand Up @@ -80,6 +81,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
"SECURITY.md",
"codecov.yaml",
"java.header",
"license-checks.xml",
Expand Down

0 comments on commit 030d3d8

Please sign in to comment.