Skip to content

Commit

Permalink
build(java): run linkage monitor as GitHub action build: migrate to f…
Browse files Browse the repository at this point in the history
…lakybot chore: update cloud-rad buckets (#574)

This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/9dfb129c-4122-4560-83af-5a01ba16cbc9/targets

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

Source-Link: googleapis/synthtool@b416a7b
Source-Link: googleapis/synthtool@f327d3b
Source-Link: googleapis/synthtool@2414b81
Source-Link: googleapis/synthtool@692715c
Source-Link: googleapis/synthtool@140ba24
Source-Link: googleapis/synthtool@e935c9e
Source-Link: googleapis/synthtool@5de29e9
Source-Link: googleapis/synthtool@d1bb917
  • Loading branch information
yoshi-automation committed Feb 18, 2021
1 parent 91df992 commit 7eccff1
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 61 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/auto-release.yaml
Expand Up @@ -4,7 +4,7 @@ name: auto-release
jobs:
approve:
runs-on: ubuntu-latest
if: contains(github.head_ref, 'release-v')
if: contains(github.head_ref, 'release-please')
steps:
- uses: actions/github-script@v3
with:
Expand All @@ -16,8 +16,8 @@ jobs:
return;
}
// only approve PRs like "chore: release <release version>"
if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
// only approve PRs like "chore(master): release <release version>"
if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
return;
}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci.yaml
Expand Up @@ -54,7 +54,11 @@ jobs:
with:
java-version: 8
- run: java -version
- run: .kokoro/linkage-monitor.sh
- name: Install artifacts to local Maven repository
run: .kokoro/build.sh
shell: bash
- name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
lint:
runs-on: ubuntu-latest
steps:
Expand Down
46 changes: 0 additions & 46 deletions .kokoro/linkage-monitor.sh

This file was deleted.

9 changes: 3 additions & 6 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 All @@ -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"
}
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}
30 changes: 30 additions & 0 deletions .kokoro/release/publish_javadoc11.cfg
@@ -0,0 +1,30 @@
# Format: //devtools/kokoro/config/proto/build.proto

# cloud-rad production
env_vars: {
key: "STAGING_BUCKET_V2"
value: "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/google-auth-library-java/.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 .kokoro/release/publish_javadoc11.sh
@@ -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-auth-library
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 to production bucket
python3 -m docuploader upload . \
--credentials ${CREDENTIALS} \
--staging-bucket ${STAGING_BUCKET_V2} \
--destination-prefix docfx-
8 changes: 4 additions & 4 deletions synth.metadata
Expand Up @@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/google-auth-library-java.git",
"sha": "427963e04702d8b73eca5ed555539b11bbe97342"
"sha": "91df992970a2146790637cc8f34dec7936d16617"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "3816b080296d4d52975079fd26c110dd26ba25af"
"sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"
}
}
],
Expand All @@ -38,7 +38,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 @@ -70,14 +69,15 @@
".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",
".kokoro/release/stage.sh",
".kokoro/trampoline.sh",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
"codecov.yaml"
]
}

0 comments on commit 7eccff1

Please sign in to comment.