Skip to content

Commit

Permalink
chore: update common templates (#447)
Browse files Browse the repository at this point in the history
  • Loading branch information
yoshi-automation committed Mar 16, 2020
1 parent 39649f0 commit c538e8f
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 28 deletions.
8 changes: 7 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
@@ -1 +1,7 @@
Fixes #<issue_number_goes_here> (it's a good idea to open an issue first for context and/or discussion)
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/google-oauth-java-client/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes #<issue_number_goes_here> ☕️
2 changes: 2 additions & 0 deletions .github/trusted-contribution.yml
@@ -0,0 +1,2 @@
trustedContributors:
- renovate-bot
30 changes: 26 additions & 4 deletions .kokoro/build.sh
Expand Up @@ -37,19 +37,23 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
fi

RETURN_CODE=0
set +e

case ${JOB_TYPE} in
test)
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
bash ${KOKORO_GFILE_DIR}/codecov.sh
bash .kokoro/coerce_logs.sh
RETURN_CODE=$?
;;
lint)
mvn \
-Penable-samples \
com.coveo:fmt-maven-plugin:check
RETURN_CODE=$?
;;
javadoc)
mvn javadoc:javadoc javadoc:test-javadoc
RETURN_CODE=$?
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} \
Expand All @@ -59,7 +63,7 @@ integration)
-Denforcer.skip=true \
-fae \
verify
bash .kokoro/coerce_logs.sh
RETURN_CODE=$?
;;
samples)
if [[ -f samples/pom.xml ]]
Expand All @@ -72,15 +76,33 @@ samples)
-Denforcer.skip=true \
-fae \
verify
bash .kokoro/coerce_logs.sh
RETURN_CODE=$?
popd
else
echo "no sample pom.xml found - skipping sample tests"
fi
;;
clirr)
mvn -B -Denforcer.skip=true clirr:check
RETURN_CODE=$?
;;
*)
;;
esac

if [ "${REPORT_COVERAGE}" == "true" ]
then
bash ${KOKORO_GFILE_DIR}/codecov.sh
fi

# fix output location of logs
bash .kokoro/coerce_logs.sh

if [[ "${ENABLE_BUILD_COP}" == "true" ]]
then
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/google-oauth-java-client
fi

echo "exiting with ${RETURN_CODE}"
exit ${RETURN_CODE}
5 changes: 5 additions & 0 deletions .kokoro/continuous/java8.cfg
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
14 changes: 14 additions & 0 deletions .kokoro/nightly/integration.cfg
Expand Up @@ -5,3 +5,17 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "java_it_service_account"
}
}
}
5 changes: 5 additions & 0 deletions .kokoro/nightly/java8.cfg
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
21 changes: 13 additions & 8 deletions .kokoro/nightly/samples.cfg
Expand Up @@ -2,23 +2,28 @@

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

env_vars: {
key: "JOB_TYPE"
value: "samples"
key: "JOB_TYPE"
value: "samples"
}

env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "keystore/73713_java_it_service_account"
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "keystore/73713_java_it_service_account"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

before_action {
Expand Down
5 changes: 5 additions & 0 deletions .kokoro/presubmit/java8.cfg
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
16 changes: 1 addition & 15 deletions synth.metadata
@@ -1,20 +1,6 @@
{
"updateTime": "2020-02-21T22:34:12.927328Z",
"updateTime": "2020-03-16T21:33:50.666509Z",
"sources": [
{
"git": {
"name": ".",
"remote": "https://github.com/googleapis/google-oauth-java-client.git",
"sha": "bcabce25df8b7dc9d3d0edfca009d47a465d1af3"
}
},
{
"git": {
"name": "synthtool",
"remote": "rpc://devrel/cloud/libraries/tools/autosynth",
"sha": "706a38c26db42299845396cdae55db635c38794a"
}
},
{
"template": {
"name": "java_library",
Expand Down

0 comments on commit c538e8f

Please sign in to comment.