Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
chore: regenerate common templates (#280)
Browse files Browse the repository at this point in the history
* chore: update cloud-rad buckets

doclava v2 => staging
docFX v3 => prod

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Tue Feb 16 17:02:08 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: b416a7befcdbc42de41cf387dcf428f894fb812b
Source-Link: googleapis/synthtool@b416a7b

* fix: don't log downloads

@chingor13 This change keeps Maven 3.6.1 and later from spamming our CI logs with page after page of lists of artifacts it's downloading that makes it much harder to find the actual test output.

Source-Author: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Source-Date: Thu Feb 18 19:58:59 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 1aeca92e4a38f47134cb955f52ea76f84f09ff88
Source-Link: googleapis/synthtool@1aeca92

* build: reduce download junk in log files

* fix: less download junk log files

* Update build.sh

Source-Author: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Source-Date: Fri Feb 19 01:42:29 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2
Source-Link: googleapis/synthtool@6946fd7
  • Loading branch information
yoshi-automation committed Feb 22, 2021
1 parent ccd56de commit 574eb10
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .kokoro/build.sh
Expand Up @@ -29,7 +29,7 @@ echo ${JOB_TYPE}

# attempt to install 3 times with exponential backoff (starting with 10 seconds)
retry_with_backoff 3 10 \
mvn install -B -V \
mvn install -B -V -ntp \
-DskipTests=true \
-Dclirr.skip=true \
-Denforcer.skip=true \
Expand Down Expand Up @@ -60,6 +60,7 @@ javadoc)
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Penable-integration-tests \
-DtrimStackTrace=false \
-Dclirr.skip=true \
Expand All @@ -81,6 +82,7 @@ samples)
pushd ${SAMPLES_DIR}
mvn -B \
-Penable-samples \
-ntp \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
Expand Down
4 changes: 2 additions & 2 deletions .kokoro/dependencies.sh
Expand Up @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

# this should run maven enforcer
retry_with_backoff 3 10 \
mvn install -B -V \
mvn install -B -V -ntp \
-DskipTests=true \
-Dclirr.skip=true

Expand Down Expand Up @@ -86,4 +86,4 @@ then
else
msg "Errors found. See log statements above."
exit 1
fi
fi
4 changes: 2 additions & 2 deletions .kokoro/release/publish_javadoc.cfg
Expand Up @@ -7,10 +7,10 @@ env_vars: {
value: "docs-staging"
}

# cloud-rad staging
env_vars: {
key: "STAGING_BUCKET_V2"
value: "docs-staging-v2"
# Production will be at: docs-staging-v2
value: "docs-staging-v2-staging"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc.sh
Expand Up @@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
--version ${VERSION} \
--language java

# upload docs
# upload docs to staging bucket
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET_V2}
2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc11.cfg
@@ -1,9 +1,9 @@
# Format: //devtools/kokoro/config/proto/build.proto

# cloud-rad production
env_vars: {
key: "STAGING_BUCKET_V2"
value: "docs-staging-v2"
# Production will be at: docs-staging-v2
}

# Configure the docker image for kokoro-trampoline
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc11.sh
Expand Up @@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \
--version ${VERSION} \
--language java

# upload yml
# upload yml to production bucket
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET_V2} \
Expand Down
4 changes: 2 additions & 2 deletions synth.metadata
Expand Up @@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-shared-dependencies.git",
"sha": "4d5e7f720d847918b307a83c95cea10c244ba595"
"sha": "ccd56de7480fd18bac17bd57e180806913bfbb38"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c"
"sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
}
}
],
Expand Down

0 comments on commit 574eb10

Please sign in to comment.