Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: 3 additions & 1 deletion .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ echo ${JOB_TYPE}

# attempt to install 3 times with exponential backoff (starting with 10 seconds)
retry_with_backoff 3 10 \
mvn install -B -V \
mvn install -B -V -ntp \
-DskipTests=true \
-Dclirr.skip=true \
-Denforcer.skip=true \
Expand Down Expand Up @@ -60,6 +60,7 @@ javadoc)
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Penable-integration-tests \
-DtrimStackTrace=false \
-Dclirr.skip=true \
Expand All @@ -81,6 +82,7 @@ samples)
pushd ${SAMPLES_DIR}
mvn -B \
-Penable-samples \
-ntp \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
Expand Down
4 changes: 2 additions & 2 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

# this should run maven enforcer
retry_with_backoff 3 10 \
mvn install -B -V \
mvn install -B -V -ntp \
-DskipTests=true \
-Dclirr.skip=true

Expand Down Expand Up @@ -86,4 +86,4 @@ then
else
msg "Errors found. See log statements above."
exit 1
fi
fi
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,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-shared-config.git",
"sha": "048eafee55117aa91ec1c7d039948cd240821588"
"sha": "d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "2414b817065726eae0bc525346c7e874f969369d"
"sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
}
}
],
Expand Down