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

Commit

Permalink
chore: regenerate common templates (#146)
Browse files Browse the repository at this point in the history
* build: rename samples lint workflow to checkstyle to disambiguate branch protection with unit lint

Source-Author: BenWhitehead <BenWhitehead@users.noreply.github.com>
Source-Date: Wed Sep 30 15:14:05 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 8a7a3021fe97aa0a3641db642fe2b767f1c8110f
Source-Link: googleapis/synthtool@8a7a302

* build(java): readme.sh should be executable

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Wed Sep 30 13:20:04 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 0762e8ee2ec21cdfc4d82020b985a104feb0453b
Source-Link: googleapis/synthtool@0762e8e

* ci(java): suggest formatting fixes

GitHub action config to run the java formatter and suggest inline fixes on the pull request.

This was tested in java-asset: [example PR](googleapis/java-asset#392).

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Tue Oct 13 09:04:08 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: b65ef07d99946d23e900ef2cc490274a16edd336
Source-Link: googleapis/synthtool@b65ef07

* ci(java): restrict presubmit samples ITs to only snapshot

This is to reduce resource consumption since we often times hit resource quota limit in samples testing.
e.g. googleapis/java-bigquerydatatransfer#410

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Thu Oct 15 17:16:14 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 27e0e916cbfdb3d5ff6639b686cc04f78a0b0386
Source-Link: googleapis/synthtool@27e0e91

* build(java): auto-approve README regeneration

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Thu Oct 15 16:04:06 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1
Source-Link: googleapis/synthtool@7c53709

* build(java): enable snippet-bot

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Mon Oct 19 16:13:57 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 5a506ec8765cc04f7e29f888b8e9b257d9a7ae11
Source-Link: googleapis/synthtool@5a506ec

* chore: clean up and update renovate.json

To remove unused package groupings and add "test" commit type

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Tue Oct 20 18:31:45 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 6abb59097be84599a1d6091fe534a49e5c5cf948
Source-Link: googleapis/synthtool@6abb590

* Update publish_javadoc.sh

We don't want quite as much and need to be in `target/devsite/reference`.

Source-Author: Les Vogel <lesv@users.noreply.github.com>
Source-Date: Thu Oct 22 14:10:05 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 9593c3b5b714cc9b17c445aee8834ac2b4b9348b
Source-Link: googleapis/synthtool@9593c3b

* chore(docs): update code of conduct of synthtool and templates

Source-Author: Christopher Wilcox <crwilcox@google.com>
Source-Date: Thu Oct 22 14:22:01 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 5f6ef0ec5501d33c4667885b37a7685a30d41a76
Source-Link: googleapis/synthtool@5f6ef0e

* chore(ci): fix typo in restrict presubmit samples ITs to only snapshot

Fixes below error in Java repos when googleapis/synthtool#804 was merged:
```
github/java-bigquerystorage/.kokoro/build.sh: line 81: pushd: {SAMPLES_DIR}: No such file or directory
```

Thanks @kolea2 for spotting this in Fusion build logs.

cc @chingor13

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Mon Oct 26 13:44:04 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: f68649c5f26bcff6817c6d21e90dac0fc71fef8e
Source-Link: googleapis/synthtool@f68649c

* chore(java): enable generated-files-bot

This bot will comment on pull requests that modify templated files. For java, we configure to read from our 2 synth.metadata files: (primary templates and README)

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Fri Oct 30 14:22:02 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: b19b401571e77192f8dd38eab5fb2300a0de9324
Source-Link: googleapis/synthtool@b19b401
  • Loading branch information
yoshi-automation authored Oct 30, 2020
1 parent 7ddfa2b commit f978a5f
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 28 deletions.
7 changes: 7 additions & 0 deletions .github/generated-files-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
externalManifests:
- type: json
file: 'synth.metadata'
jsonpath: '$.generatedFiles[*]'
- type: json
file: '.github/readme/synth.metadata/synth.metadata'
jsonpath: '$.generatedFiles[*]'
Empty file added .github/snippet-bot.yml
Empty file.
54 changes: 54 additions & 0 deletions .github/workflows/approve-readme.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
on:
pull_request:
name: auto-merge-readme
jobs:
approve:
runs-on: ubuntu-latest
if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
steps:
- uses: actions/github-script@v3.0.0
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
script: |
// only approve PRs from yoshi-automation
if (context.payload.pull_request.user.login !== "yoshi-automation") {
return;
}
// only approve PRs like "chore: release <release version>"
if (!context.payload.pull_request.title === "chore: regenerate README") {
return;
}
// only approve PRs with README.md and synth.metadata changes
const files = new Set(
(
await github.paginate(
github.pulls.listFiles.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
})
)
).map(file => file.filename)
);
if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) {
return;
}
// approve README regeneration PR
await github.pulls.createReview({
owner: context.repo.owner,
repo: context.repo.repo,
body: 'Rubber stamped PR!',
pull_number: context.payload.pull_request.number,
event: 'APPROVE'
});
// attach automerge label
await github.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
labels: ['automerge']
});
25 changes: 25 additions & 0 deletions .github/workflows/formatting.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
on:
pull_request_target:
types: [opened, synchronize]
branches:
- master
name: format
jobs:
format-code:
runs-on: ubuntu-latest
env:
ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }}
steps:
- uses: actions/checkout@v2
with:
ref: ${{github.event.pull_request.head.ref}}
repository: ${{github.event.pull_request.head.repo.full_name}}
- uses: actions/setup-java@v1
with:
java-version: 11
- run: "mvn com.coveo:fmt-maven-plugin:format"
- uses: googleapis/code-suggester@v1.8.0
with:
command: review
pull_number: ${{ github.event.pull_request.number }}
git_dir: '.'
2 changes: 1 addition & 1 deletion .github/workflows/samples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ on:
pull_request:
name: samples
jobs:
lint:
checkstyle:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
11 changes: 9 additions & 2 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,16 @@ integration)
RETURN_CODE=$?
;;
samples)
if [[ -f samples/pom.xml ]]
SAMPLES_DIR=samples
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
then
pushd samples
SAMPLES_DIR=samples/snapshot
fi

if [[ -f ${SAMPLES_DIR}/pom.xml ]]
then
pushd ${SAMPLES_DIR}
mvn -B \
-Penable-samples \
-DtrimStackTrace=false \
Expand Down
Empty file modified .kokoro/readme.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ popd
# V2
mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"

pushd target/devsite
pushd target/devsite/reference

# create metadata
python3 -m docuploader create-metadata \
Expand Down
7 changes: 4 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- # Generated by synthtool. DO NOT EDIT! !-->
# Code of Conduct

## Our Pledge
Expand Down Expand Up @@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the
behavior is threatening or harassing, report it. We are dedicated to providing
an environment where participants feel welcome and safe.

Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the
Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to
Reports should be directed to *googleapis-stewards@google.com*, the
Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to
receive and address reported violations of the code of conduct. They will then
work with a committee consisting of representatives from the Open Source
Programs Office and the Google Open Source Strategy team. If for any reason you
are uncomfortable reaching out the Project Steward, please email
are uncomfortable reaching out to the Project Steward, please email
opensource@google.com.

We will investigate every complaint, but you may not receive a direct response.
Expand Down
30 changes: 11 additions & 19 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@
],
"versionScheme": "docker"
},
{
"packagePatterns": [
"^com.google.api:gax",
"^com.google.auth:",
"^com.google.cloud:google-cloud-core",
"^io.grpc:",
"^com.google.guava:"
],
"groupName": "core dependencies"
},
{
"packagePatterns": [
"^com.google.http-client:",
"^com.google.oauth-client:",
"^com.google.api-client:"
],
"groupName": "core transport dependencies"
},
{
"packagePatterns": [
"*"
Expand Down Expand Up @@ -63,6 +45,16 @@
"semanticCommitType": "chore",
"semanticCommitScope": "deps"
},
{
"packagePatterns": [
"^junit:junit",
"^com.google.truth:truth",
"^org.mockito:mockito-core",
"^org.objenesis:objenesis"
],
"semanticCommitType": "test",
"semanticCommitScope": "deps"
},
{
"packagePatterns": [
"^com.google.cloud:google-cloud-"
Expand All @@ -78,4 +70,4 @@
],
"semanticCommits": true,
"masterIssue": true
}
}
8 changes: 6 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-mediatranslation.git",
"sha": "d5b38890565a89f1594bba606db04cfade229c77"
"sha": "7ddfa2b271197a1ef02c7b11f3d4696298f8433c"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "e6168630be3e31eede633ba2c6f1cd64248dec1c"
"sha": "b19b401571e77192f8dd38eab5fb2300a0de9324"
}
}
],
Expand All @@ -40,11 +40,15 @@
".github/ISSUE_TEMPLATE/feature_request.md",
".github/ISSUE_TEMPLATE/support_request.md",
".github/PULL_REQUEST_TEMPLATE.md",
".github/generated-files-bot.yml",
".github/readme/synth.py",
".github/release-please.yml",
".github/snippet-bot.yml",
".github/trusted-contribution.yml",
".github/workflows/approve-readme.yaml",
".github/workflows/auto-release.yaml",
".github/workflows/ci.yaml",
".github/workflows/formatting.yaml",
".github/workflows/samples.yaml",
".kokoro/build.bat",
".kokoro/build.sh",
Expand Down

0 comments on commit f978a5f

Please sign in to comment.