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

Commit

Permalink
chore: Re-generated to pick up changes from synthtool (#142)
Browse files Browse the repository at this point in the history
* ci: linkage monitor CI job to use build.sh

This PR updates the GitHub Actions configuration for Linkage Monitor. Before this change, the CI configuration has "mvn install" command with 6 options. It turned out that a slight difference in the command line option from "build.sh" fails the build in google-auth-library-java repository (GoogleCloudPlatform/cloud-opensource-java#1941). (@Neenu1995 found the build failure. Thanks!)

Therefore, this change updates the configuration so that Linkage Monitor job just uses "build.sh" to install the artifacts into local Maven repository.

# How did I test?

I tested this change in java-spanner repository with this draft PR: googleapis/java-spanner#868

<img width="889" alt="Screen Shot 2021-02-12 at 16 54 18" src="https://user-images.githubusercontent.com/28604/107826467-f3cd5c80-6d52-11eb-86f1-1a8053326978.png">

It succeeded.

Source-Author: Tomo Suzuki <suztomo@google.com>
Source-Date: Tue Feb 16 15:56:09 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: f327d3b657a63ae4a8efd7f011a15eacae36b59c
Source-Link: googleapis/synthtool@f327d3b

* 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
  • Loading branch information
yoshi-automation committed Feb 17, 2021
1 parent 6f4657b commit 5411cd0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 17 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,10 @@ jobs:
java-version: 8
- run: java -version
- 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
run: .kokoro/build.sh
shell: bash
- uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
- 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
4 changes: 2 additions & 2 deletions .kokoro/release/publish_javadoc.cfg
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-dialogflow-cx.git",
"sha": "5a6c5d127d298c4d3acd5fdf13839c17b9f64d08"
"sha": "6f4657b1fa012e1e29bb722533a4b3328f57730e"
}
},
{
Expand All @@ -27,7 +27,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "2414b817065726eae0bc525346c7e874f969369d"
"sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"
}
}
],
Expand Down

0 comments on commit 5411cd0

Please sign in to comment.