diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml new file mode 100644 index 00000000..d26427e4 --- /dev/null +++ b/.github/workflows/auto-release.yaml @@ -0,0 +1,69 @@ +on: + pull_request: +name: auto-release +jobs: + approve: + runs-on: ubuntu-latest + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + debug: true + script: | + // only approve PRs from release-please[bot] + if (context.payload.pull_request.user.login !== "release-please[bot]") { + return; + } + + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + return; + } + + // trigger auto-release when + // 1) it is a SNAPSHOT release (auto-generated post regular release) + // 2) there are dependency updates only + // 3) there are no open dependency update PRs in this repo (to avoid multiple releases) + if ( + context.payload.pull_request.body.includes("Fix") || + context.payload.pull_request.body.includes("Build") || + context.payload.pull_request.body.includes("Documentation") || + context.payload.pull_request.body.includes("BREAKING CHANGES") || + context.payload.pull_request.body.includes("Features") + ) { + console.log( "Not auto-releasing since it is not a dependency-update-only release." ); + return; + } + + const promise = github.pulls.list.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + state: 'open' + }); + const open_pulls = await github.paginate(promise) + + if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) { + for ( const pull of open_pulls ) { + if ( pull.title.startsWith("deps: update dependency") ) { + console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." ); + return; + } + } + } + + // approve release PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped release!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach kokoro:force-run and automerge labels + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['kokoro:force-run', 'automerge'] + }); \ No newline at end of file diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml new file mode 100644 index 00000000..a1d50073 --- /dev/null +++ b/.github/workflows/samples.yaml @@ -0,0 +1,14 @@ +on: + pull_request: +name: samples +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Run checkstyle + run: mvn -P lint --quiet --batch-mode checkstyle:check + working-directory: samples/snippets diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg index b868a21e..6b6f0808 100644 --- a/.kokoro/release/stage.cfg +++ b/.kokoro/release/stage.cfg @@ -13,32 +13,7 @@ action { } } -# Fetch the token needed for reporting release status to GitHub -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - } - } -} - -# Fetch magictoken to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "releasetool-magictoken" - } - } -} - -# Fetch api key to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "magic-github-proxy-api-key" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ccaf5b..d98d968c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.120.2](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.1...v0.120.2) (2020-09-21) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.9.0 ([#215](https://www.github.com/googleapis/java-errorreporting/issues/215)) ([977467b](https://www.github.com/googleapis/java-errorreporting/commit/977467bde2809227864fddf0e207631f1f38292c)) + ### [0.120.1](https://www.github.com/googleapis/java-errorreporting/compare/v0.120.0...v0.120.1) (2020-08-10) diff --git a/README.md b/README.md index 0ff2d28c..e69f1c42 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 8.1.0 + 9.1.0 pom import @@ -60,7 +60,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-errorreporting - 0.119.2-beta + 0.120.1-beta ``` @@ -69,11 +69,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-errorreporting:0.120.1-beta' +compile 'com.google.cloud:google-cloud-errorreporting:0.120.2-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.1-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.120.2-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-errorreporting-bom/pom.xml b/google-cloud-errorreporting-bom/pom.xml index a933b1c5..512b9e09 100644 --- a/google-cloud-errorreporting-bom/pom.xml +++ b/google-cloud-errorreporting-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-errorreporting-bom - 0.120.1-beta + 0.120.2-beta pom com.google.cloud google-cloud-shared-config - 0.8.1 + 0.9.2 Google Cloud errorreporting BOM @@ -63,17 +63,17 @@ com.google.cloud google-cloud-errorreporting - 0.120.1-beta + 0.120.2-beta com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 1e301e36..904b2498 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting - 0.120.1-beta + 0.120.2-beta jar Google Cloud Error Reporting https://github.com/googleapis/java-errorreporting @@ -11,7 +11,7 @@ com.google.cloud google-cloud-errorreporting-parent - 0.120.1-beta + 0.120.2-beta google-cloud-errorreporting diff --git a/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/grpc-google-cloud-error-reporting-v1beta1/pom.xml index 36acd25a..c151a903 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/pom.xml +++ b/grpc-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 grpc-google-cloud-error-reporting-v1beta1 GRPC library for grpc-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.1-beta + 0.120.2-beta diff --git a/pom.xml b/pom.xml index afa6ac24..ccf25c7b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-errorreporting-parent pom - 0.120.1-beta + 0.120.2-beta Google Cloud Error Reporting Parent https://github.com/googleapis/java-errorreporting @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.8.1 + 0.9.2 @@ -70,23 +70,23 @@ com.google.cloud google-cloud-errorreporting - 0.120.1-beta + 0.120.2-beta com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 com.google.cloud google-cloud-shared-dependencies - 0.8.6 + 0.9.0 pom import @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.0 + 3.1.1 diff --git a/proto-google-cloud-error-reporting-v1beta1/pom.xml b/proto-google-cloud-error-reporting-v1beta1/pom.xml index a1563df7..903db29e 100644 --- a/proto-google-cloud-error-reporting-v1beta1/pom.xml +++ b/proto-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.86.1 + 0.86.2 proto-google-cloud-error-reporting-v1beta1 PROTO library for proto-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.120.1-beta + 0.120.2-beta diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9ef7564a..fea32102 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-errorreporting - 0.119.2-beta + 0.120.1-beta com.google.cloud google-cloud-core - 1.93.6 + 1.93.8 junit @@ -58,7 +58,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 81780616..01a50d4b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,14 +28,14 @@ com.google.cloud google-cloud-errorreporting - 0.120.1-beta + 0.120.2-beta com.google.cloud google-cloud-core - 1.93.6 + 1.93.8 junit @@ -57,7 +57,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index aea5ddb3..42f17ea6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 8.1.0 + 9.1.0 pom import diff --git a/synth.metadata b/synth.metadata index cc4e0d34..6d0f08e7 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-errorreporting.git", - "sha": "0d29ee2023c45a49a08d0c8b08e1571137500cd1" + "sha": "3ff93cf2602867993a59d742563b38261c89fecf" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" + "sha": "538a68019eb4a36a0cdfa4021f324dd01b784395" } } ], @@ -42,7 +42,9 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/release-please.yml", ".github/trusted-contribution.yml", + ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", + ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", ".kokoro/coerce_logs.sh", diff --git a/versions.txt b/versions.txt index 10e3eaf8..a0254ff3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -grpc-google-cloud-errorreporting-v1beta1:0.86.1:0.86.1 -proto-google-cloud-errorreporting-v1beta1:0.86.1:0.86.1 -google-cloud-errorreporting:0.120.1-beta:0.120.1-beta \ No newline at end of file +grpc-google-cloud-errorreporting-v1beta1:0.86.2:0.86.2 +proto-google-cloud-errorreporting-v1beta1:0.86.2:0.86.2 +google-cloud-errorreporting:0.120.2-beta:0.120.2-beta \ No newline at end of file