Skip to content

Commit

Permalink
chore: Re-generated to pick up changes from synthtool (#249)
Browse files Browse the repository at this point in the history
* chore(java): detect sample-secrets in build.sh

Fixes #904

Source-Author: Neenu Shaji <Neenu1995@users.noreply.github.com>
Source-Date: Wed Mar 24 15:50:02 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef
Source-Link: googleapis/synthtool@bb854b6

* 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
  • Loading branch information
yoshi-automation committed May 18, 2021
1 parent 4724e63 commit 001652f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
7 changes: 6 additions & 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 Expand Up @@ -79,6 +79,11 @@ samples)

if [[ -f ${SAMPLES_DIR}/pom.xml ]]
then
for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
[[ -f "$FILE" ]] || continue
source "$FILE"
done

pushd ${SAMPLES_DIR}
mvn -B \
-Penable-samples \
Expand Down
1 change: 1 addition & 0 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,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 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
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
5 changes: 3 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-shared-config.git",
"sha": "b7447a09e2b07bff027ecfa3533fad3c39cbc677"
"sha": "51c9f68ff1736761b21c921f078ab2c8675ff268"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "d0bdade9a962042dc0f770cf631086f3db59b5b0"
"sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
}
}
],
Expand All @@ -25,6 +25,7 @@
".github/generated-files-bot.yml",
".github/readme/synth.py",
".github/snippet-bot.yml",
".github/sync-repo-settings.yaml",
".github/trusted-contribution.yml",
".github/workflows/approve-readme.yaml",
".github/workflows/ci.yaml",
Expand Down

0 comments on commit 001652f

Please sign in to comment.