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

Commit 33dcb78

Browse files
ci: linkage monitor CI job to use build.sh (#147)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/bbb5ae02-038e-45a4-bc47-250afdece2a7/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: googleapis/synthtool@6946fd7 Source-Link: googleapis/synthtool@1aeca92 Source-Link: googleapis/synthtool@b416a7b Source-Link: googleapis/synthtool@f327d3b build: reduce download junk in log files chore: update cloud-rad buckets fix: don't log downloads
1 parent fc8bf81 commit 33dcb78

8 files changed

Lines changed: 15 additions & 20 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,10 @@ jobs:
5555
java-version: 8
5656
- run: java -version
5757
- name: Install artifacts to local Maven repository
58-
run: |
59-
source .kokoro/common.sh
60-
retry_with_backoff 3 10 \
61-
mvn install -B -V \
62-
-Dmaven.test.skip -DskipTests=true \
63-
-Dclirr.skip=true \
64-
-Denforcer.skip=true \
65-
-Dmaven.javadoc.skip=true \
66-
-Dgcloud.download.skip=true
58+
run: .kokoro/build.sh
6759
shell: bash
68-
- uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
60+
- name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
61+
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
6962
lint:
7063
runs-on: ubuntu-latest
7164
steps:

.kokoro/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ echo ${JOB_TYPE}
2929

3030
# attempt to install 3 times with exponential backoff (starting with 10 seconds)
3131
retry_with_backoff 3 10 \
32-
mvn install -B -V \
32+
mvn install -B -V -ntp \
3333
-DskipTests=true \
3434
-Dclirr.skip=true \
3535
-Denforcer.skip=true \
@@ -60,6 +60,7 @@ javadoc)
6060
;;
6161
integration)
6262
mvn -B ${INTEGRATION_TEST_ARGS} \
63+
-ntp \
6364
-Penable-integration-tests \
6465
-DtrimStackTrace=false \
6566
-Dclirr.skip=true \
@@ -81,6 +82,7 @@ samples)
8182
pushd ${SAMPLES_DIR}
8283
mvn -B \
8384
-Penable-samples \
85+
-ntp \
8486
-DtrimStackTrace=false \
8587
-Dclirr.skip=true \
8688
-Denforcer.skip=true \

.kokoro/dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
3131

3232
# this should run maven enforcer
3333
retry_with_backoff 3 10 \
34-
mvn install -B -V \
34+
mvn install -B -V -ntp \
3535
-DskipTests=true \
3636
-Dclirr.skip=true
3737

@@ -86,4 +86,4 @@ then
8686
else
8787
msg "Errors found. See log statements above."
8888
exit 1
89-
fi
89+
fi

.kokoro/release/publish_javadoc.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ env_vars: {
77
value: "docs-staging"
88
}
99

10+
# cloud-rad staging
1011
env_vars: {
1112
key: "STAGING_BUCKET_V2"
12-
value: "docs-staging-v2"
13-
# Production will be at: docs-staging-v2
13+
value: "docs-staging-v2-staging"
1414
}
1515

1616
env_vars: {

.kokoro/release/publish_javadoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
7171
--version ${VERSION} \
7272
--language java
7373

74-
# upload docs
74+
# upload docs to staging bucket
7575
python3 -m docuploader upload . \
7676
--credentials ${CREDENTIALS} \
7777
--staging-bucket ${STAGING_BUCKET_V2}

.kokoro/release/publish_javadoc11.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3+
# cloud-rad production
34
env_vars: {
45
key: "STAGING_BUCKET_V2"
56
value: "docs-staging-v2"
6-
# Production will be at: docs-staging-v2
77
}
88

99
# Configure the docker image for kokoro-trampoline

.kokoro/release/publish_javadoc11.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \
4848
--version ${VERSION} \
4949
--language java
5050

51-
# upload yml
51+
# upload yml to production bucket
5252
python3 -m docuploader upload . \
5353
--credentials ${CREDENTIALS} \
5454
--staging-bucket ${STAGING_BUCKET_V2} \

synth.metadata

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-orgpolicy.git",
7-
"sha": "0f78828378abd02670722f51e406cd3d724ca4b2"
7+
"sha": "fc8bf81304b4be71765ff45678c372060d41179d"
88
}
99
},
1010
{
@@ -19,7 +19,7 @@
1919
"git": {
2020
"name": "synthtool",
2121
"remote": "https://github.com/googleapis/synthtool.git",
22-
"sha": "2414b817065726eae0bc525346c7e874f969369d"
22+
"sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
2323
}
2424
}
2525
],

0 commit comments

Comments
 (0)