diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 00000000..4bc2a480 --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-video-transcoder.git", + "sha": "8ee2a20eb4d992c7dcfba391e780cb7571ab5a61" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "6dc98b26a9c823e92fa21455fb6e5862613c49c2" + } + } + ] +} \ No newline at end of file diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml new file mode 100644 index 00000000..e69de29b diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml new file mode 100644 index 00000000..e2d841d6 --- /dev/null +++ b/.github/workflows/approve-readme.yaml @@ -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 " + 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'] + }); diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml new file mode 100644 index 00000000..d4d367cf --- /dev/null +++ b/.github/workflows/formatting.yaml @@ -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: '.' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 906c1178..863b497b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -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 \ diff --git a/CHANGELOG.md b/CHANGELOG.md index ec371010..a81774cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.1.2](https://www.github.com/googleapis/java-video-transcoder/compare/v0.1.1...v0.1.2) (2020-10-22) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.12.1 ([#38](https://www.github.com/googleapis/java-video-transcoder/issues/38)) ([8ee2a20](https://www.github.com/googleapis/java-video-transcoder/commit/8ee2a20eb4d992c7dcfba391e780cb7571ab5a61)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#42](https://www.github.com/googleapis/java-video-transcoder/issues/42)) ([2f3a8ed](https://www.github.com/googleapis/java-video-transcoder/commit/2f3a8ed3d1cab75579db69503708a625207cfcae)) + ### [0.1.1](https://www.github.com/googleapis/java-video-transcoder/compare/v0.1.0...v0.1.1) (2020-10-08) diff --git a/README.md b/README.md index 792f864d..60f64c99 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,10 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-video-transcoder - 0.0.0 + 0.1.1 ``` -[//]: # ({x-version-update-start:google-cloud-video-transcoder:released}) - If you are using Gradle, add this to your dependencies ```Groovy compile 'com.google.cloud:google-cloud-video-transcoder:0.1.1' @@ -34,7 +32,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-video-transcoder" % "0.1.1" ``` -[//]: # ({x-version-update-end}) ## Authentication diff --git a/google-cloud-video-transcoder-bom/pom.xml b/google-cloud-video-transcoder-bom/pom.xml index a1116f2b..41eba9bd 100644 --- a/google-cloud-video-transcoder-bom/pom.xml +++ b/google-cloud-video-transcoder-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-video-transcoder-bom - 0.1.1 + 0.1.2 pom com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.3 Google Video Transcoder BOM @@ -68,17 +68,17 @@ com.google.cloud google-cloud-video-transcoder - 0.1.1 + 0.1.2 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 diff --git a/google-cloud-video-transcoder/pom.xml b/google-cloud-video-transcoder/pom.xml index 5e862f01..e406783b 100644 --- a/google-cloud-video-transcoder/pom.xml +++ b/google-cloud-video-transcoder/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-video-transcoder - 0.1.1 + 0.1.2 jar Google Video Transcoder https://github.com/googleapis/java-video-transcoder @@ -11,7 +11,7 @@ com.google.cloud google-cloud-video-transcoder-parent - 0.1.1 + 0.1.2 google-cloud-video-transcoder @@ -68,7 +68,7 @@ junit junit test - 4.13 + 4.13.1 diff --git a/grpc-google-cloud-video-transcoder-v1beta1/pom.xml b/grpc-google-cloud-video-transcoder-v1beta1/pom.xml index 9db7cef2..be1897e7 100644 --- a/grpc-google-cloud-video-transcoder-v1beta1/pom.xml +++ b/grpc-google-cloud-video-transcoder-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 grpc-google-cloud-video-transcoder-v1beta1 GRPC library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.1.1 + 0.1.2 diff --git a/pom.xml b/pom.xml index 258460ea..24b661f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-video-transcoder-parent pom - 0.1.1 + 0.1.2 Google Video Transcoder Parent https://github.com/googleapis/java- @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.3 @@ -70,23 +70,23 @@ com.google.cloud google-cloud-video-transcoder - 0.1.1 + 0.1.2 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 com.google.api.grpc grpc-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 com.google.cloud google-cloud-shared-dependencies - 0.10.2 + 0.13.0 pom import diff --git a/proto-google-cloud-video-transcoder-v1beta1/pom.xml b/proto-google-cloud-video-transcoder-v1beta1/pom.xml index d49e0ccf..903aef3a 100644 --- a/proto-google-cloud-video-transcoder-v1beta1/pom.xml +++ b/proto-google-cloud-video-transcoder-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-video-transcoder-v1beta1 - 0.1.1 + 0.1.2 proto-google-cloud-video-transcoder-v1beta1 Proto library for google-cloud-video-transcoder com.google.cloud google-cloud-video-transcoder-parent - 0.1.1 + 0.1.2 diff --git a/renovate.json b/renovate.json index a00cf38d..f2850eb7 100644 --- a/renovate.json +++ b/renovate.json @@ -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": [ "*" @@ -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-" @@ -78,4 +70,4 @@ ], "semanticCommits": true, "masterIssue": true -} \ No newline at end of file +} diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ebcdceb6..a36a54ac 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-video-transcoder - 0.0.0 + 0.1.1 junit junit - 4.13 + 4.13.1 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index aef736ba..443fd4a8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,14 +28,14 @@ com.google.cloud google-cloud-video-transcoder - 0.1.1 + 0.1.2 junit junit - 4.13 + 4.13.1 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 59d76246..f892bddc 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,13 +28,13 @@ com.google.cloud google-cloud-video-transcoder - 0.0.0 + 0.1.1 junit junit - 4.13 + 4.13.1 test diff --git a/synth.metadata b/synth.metadata index 61af957c..04fd3f4e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-video-transcoder.git", - "sha": "be02ff8550b0304535befd329ea04884ee6f1c0b" + "sha": "2f3a8ed3d1cab75579db69503708a625207cfcae" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" + "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" } } ], @@ -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", diff --git a/versions.txt b/versions.txt index c0f08167..bfb24d7d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-video-transcoder:0.1.1:0.1.1 -proto-google-cloud-video-transcoder-v1beta1:0.1.1:0.1.1 -grpc-google-cloud-video-transcoder-v1beta1:0.1.1:0.1.1 \ No newline at end of file +google-cloud-video-transcoder:0.1.2:0.1.2 +proto-google-cloud-video-transcoder-v1beta1:0.1.2:0.1.2 +grpc-google-cloud-video-transcoder-v1beta1:0.1.2:0.1.2 \ No newline at end of file