Skip to content

Commit

Permalink
chore: Re-generated to pick up changes from synthtool. (#312)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
yoshi-automation authored Oct 22, 2020
1 parent 1a556ef commit 3f15944
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 22 deletions.
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: '.'
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
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
}
}
5 changes: 4 additions & 1 deletion synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b"
"sha": "6abb59097be84599a1d6091fe534a49e5c5cf948"
}
}
],
Expand All @@ -42,9 +42,12 @@
".github/PULL_REQUEST_TEMPLATE.md",
".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 3f15944

Please sign in to comment.