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

Commit

Permalink
chore: regenerate common templates (#198)
Browse files Browse the repository at this point in the history
This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/b24e7806-61f7-4799-8de0-fc5993ab89fb/targets

- [ ] To automatically regenerate this PR, check this box.

Source-Link: googleapis/synthtool@f8823de
Source-Link: googleapis/synthtool@4530cc6
Source-Link: googleapis/synthtool@dd230c8
  • Loading branch information
yoshi-automation committed Aug 7, 2020
1 parent 6e3f583 commit efe8fda
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 180 deletions.
12 changes: 0 additions & 12 deletions .kokoro/continuous/dependencies.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/integration.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/java11.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/java7.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions .kokoro/continuous/java8-osx.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions .kokoro/continuous/java8-win.cfg

This file was deleted.

13 changes: 0 additions & 13 deletions .kokoro/continuous/lint.cfg

This file was deleted.

53 changes: 0 additions & 53 deletions .kokoro/continuous/propose_release.cfg

This file was deleted.

31 changes: 0 additions & 31 deletions .kokoro/continuous/samples.cfg

This file was deleted.

9 changes: 5 additions & 4 deletions .kokoro/dependencies.sh
Expand Up @@ -43,12 +43,13 @@ function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# 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 -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt

# Output dep list generated using the flattened pom (test scope deps are ommitted)
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt

# Compare two dependency lists
msg "Comparing dependency lists..."
Expand Down Expand Up @@ -85,4 +86,4 @@ then
else
msg "Errors found. See log statements above."
exit 1
fi
fi
12 changes: 0 additions & 12 deletions .kokoro/nightly/dependencies.cfg

This file was deleted.

13 changes: 0 additions & 13 deletions .kokoro/nightly/lint.cfg

This file was deleted.

10 changes: 10 additions & 0 deletions .kokoro/release/publish_javadoc.cfg
@@ -1,14 +1,24 @@
# Format: //devtools/kokoro/config/proto/build.proto

gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"

env_vars: {
key: "STAGING_BUCKET"
value: "docs-staging"
}

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

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/java-tasks/.kokoro/release/publish_javadoc.sh"
}


before_action {
fetch_keystore {
keystore_resource {
Expand Down
25 changes: 23 additions & 2 deletions .kokoro/release/publish_javadoc.sh
Expand Up @@ -24,20 +24,25 @@ 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")/../../

# install docuploader package
python3 -m pip install gcp-docuploader

# compile all packages
mvn clean install -B -DskipTests=true
mvn clean install -B -q -DskipTests=true

NAME=google-cloud-tasks
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)

# build the docs
mvn site -B
mvn site -B -q

pushd target/site/apidocs

Expand All @@ -53,3 +58,19 @@ python3 -m docuploader upload . \
--staging-bucket ${STAGING_BUCKET}

popd

# V2
mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"

pushd target/devsite

# create metadata
python3 -m docuploader create-metadata \
--name ${NAME} \
--version ${VERSION} \
--language java

# upload docs
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET_V2}
15 changes: 2 additions & 13 deletions synth.metadata
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-tasks.git",
"sha": "f9613027fbe0acc65653668fd22c0c3e92f2e7cd"
"sha": "6e3f583d9fc9bdb429f68636153e75c4104a5ec3"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
"sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
}
}
],
Expand Down Expand Up @@ -66,27 +66,16 @@
".kokoro/common.cfg",
".kokoro/common.sh",
".kokoro/continuous/common.cfg",
".kokoro/continuous/dependencies.cfg",
".kokoro/continuous/integration.cfg",
".kokoro/continuous/java11.cfg",
".kokoro/continuous/java7.cfg",
".kokoro/continuous/java8-osx.cfg",
".kokoro/continuous/java8-win.cfg",
".kokoro/continuous/java8.cfg",
".kokoro/continuous/lint.cfg",
".kokoro/continuous/propose_release.cfg",
".kokoro/continuous/samples.cfg",
".kokoro/dependencies.sh",
".kokoro/linkage-monitor.sh",
".kokoro/nightly/common.cfg",
".kokoro/nightly/dependencies.cfg",
".kokoro/nightly/integration.cfg",
".kokoro/nightly/java11.cfg",
".kokoro/nightly/java7.cfg",
".kokoro/nightly/java8-osx.cfg",
".kokoro/nightly/java8-win.cfg",
".kokoro/nightly/java8.cfg",
".kokoro/nightly/lint.cfg",
".kokoro/nightly/samples.cfg",
".kokoro/populate-secrets.sh",
".kokoro/presubmit/clirr.cfg",
Expand Down

0 comments on commit efe8fda

Please sign in to comment.