Skip to content

Commit

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

* build: migrate to flakybot

Source-Author: Justin Beckwith <[email protected]>
Source-Date: Thu Jan 28 22:22:38 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: d1bb9173100f62c0cfc8f3138b62241e7f47ca6a
Source-Link: googleapis/synthtool@d1bb917

* build(java): generate docfx yml on release

* feat: generate docfx yml on release

* fix: updates name variable

* fix: remove non needed resource

* fix: update date

Source-Author: Emily Ball <[email protected]>
Source-Date: Mon Feb 1 15:24:59 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 5de29e9434b63ea6d7e46dc348521c62969af1a1
Source-Link: googleapis/synthtool@5de29e9

* build(java): run linkage monitor as GitHub action

Source-Author: Tomo Suzuki <[email protected]>
Source-Date: Tue Feb 2 16:20:26 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: e935c9ecb47da0f2e054f5f1845f7cf7c95fa625
Source-Link: googleapis/synthtool@e935c9e
  • Loading branch information
yoshi-automation authored Feb 3, 2021
1 parent 2faaf1c commit 66a383a
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 54 deletions.
13 changes: 12 additions & 1 deletion java-resourcemanager/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,18 @@ jobs:
with:
java-version: 8
- run: java -version
- run: .kokoro/linkage-monitor.sh
- name: Install artifacts to local Maven repository
run: |
source .kokoro/common.sh
retry_with_backoff 3 10 \
mvn install -B -V \
-Dmaven.test.skip -DskipTests=true \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true
shell: bash
- uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
lint:
runs-on: ubuntu-latest
steps:
Expand Down
46 changes: 0 additions & 46 deletions java-resourcemanager/.kokoro/linkage-monitor.sh

This file was deleted.

5 changes: 1 addition & 4 deletions java-resourcemanager/.kokoro/release/publish_javadoc.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@ before_action {
keyname: "docuploader_service_account"
}
}
}

# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
}
30 changes: 30 additions & 0 deletions java-resourcemanager/.kokoro/release/publish_javadoc11.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Format: //devtools/kokoro/config/proto/build.proto

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

# Configure the docker image for kokoro-trampoline
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
}

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

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "docuploader_service_account"
}
}
}

# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
55 changes: 55 additions & 0 deletions java-resourcemanager/.kokoro/release/publish_javadoc11.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/bin/bash
# Copyright 2021 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -eo pipefail

if [[ -z "${CREDENTIALS}" ]]; then
CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
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 -q -DskipTests=true

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

# V3 generates docfx yml from javadoc
# generate yml
mvn clean site -B -q -P docFX

pushd target/docfx-yml

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

# upload yml
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET_V2} \
--destination-prefix docfx-
7 changes: 4 additions & 3 deletions java-resourcemanager/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-resourcemanager.git",
"sha": "4bdc56a51398070542a46f2f827852270ea705c4"
"sha": "0950e825836c5dd270f1f749b5427b36808b0939"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "3816b080296d4d52975079fd26c110dd26ba25af"
"sha": "e935c9ecb47da0f2e054f5f1845f7cf7c95fa625"
}
}
],
Expand Down Expand Up @@ -40,7 +40,6 @@
".kokoro/continuous/java8.cfg",
".kokoro/continuous/readme.cfg",
".kokoro/dependencies.sh",
".kokoro/linkage-monitor.sh",
".kokoro/nightly/common.cfg",
".kokoro/nightly/integration.cfg",
".kokoro/nightly/java11.cfg",
Expand Down Expand Up @@ -72,6 +71,8 @@
".kokoro/release/promote.sh",
".kokoro/release/publish_javadoc.cfg",
".kokoro/release/publish_javadoc.sh",
".kokoro/release/publish_javadoc11.cfg",
".kokoro/release/publish_javadoc11.sh",
".kokoro/release/snapshot.cfg",
".kokoro/release/snapshot.sh",
".kokoro/release/stage.cfg",
Expand Down

0 comments on commit 66a383a

Please sign in to comment.