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 08569b10..81af6cc9 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 682f536d..2d9ea7be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.1.3](https://www.github.com/googleapis/java-containeranalysis/compare/v1.1.2...v1.1.3) (2020-09-21) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.9.0 ([#235](https://www.github.com/googleapis/java-containeranalysis/issues/235)) ([1267733](https://www.github.com/googleapis/java-containeranalysis/commit/126773397176a587043aba3a7b8706edb3c9f8b3)) + ### [1.1.2](https://www.github.com/googleapis/java-containeranalysis/compare/v1.1.1...v1.1.2) (2020-08-12) diff --git a/README.md b/README.md index ca92c989..c2d38f24 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,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 @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 1.1.0 + 1.1.1 ``` @@ -47,11 +47,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-containeranalysis:1.1.2' +compile 'com.google.cloud:google-cloud-containeranalysis:1.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "1.1.3" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index d5c75c67..3958897b 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 1.1.2 + 1.1.3 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 com.google.cloud google-cloud-containeranalysis - 1.1.2 + 1.1.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 31bec9b1..50e8b4b6 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 1.1.2 + 1.1.3 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 1.1.2 + 1.1.3 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 38406c69..7b2a267a 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.1.2 + 1.1.3 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index 4bec2da1..49d0cc15 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.1.2 + 1.1.3 diff --git a/pom.xml b/pom.xml index 91182c25..b02c5c19 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 1.1.2 + 1.1.3 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 com.google.cloud google-cloud-containeranalysis - 1.1.2 + 1.1.3 com.google.cloud google-cloud-shared-dependencies - 0.8.6 + 0.9.0 pom import @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.0 + 3.1.1 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 056f55e5..3784d638 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 1.1.2 + 1.1.3 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 1.1.2 + 1.1.3 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index d444c695..ac5aa473 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.87.2 + 0.87.3 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 1.1.2 + 1.1.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index c07013ef..9213c325 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 cd56ba54..fcdd37df 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "161fdba805fb5a03ed9f224f831382cdb0834b05" + "sha": "9e93875a67a694640c6146395aae4e26214a0b27" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" + "sha": "538a68019eb4a36a0cdfa4021f324dd01b784395" } } ], @@ -59,7 +59,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 a8a7aab4..a8698f08 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:1.1.2:1.1.2 -proto-google-cloud-containeranalysis-v1beta1:0.87.2:0.87.2 -grpc-google-cloud-containeranalysis-v1beta1:0.87.2:0.87.2 -grpc-google-cloud-containeranalysis-v1:1.1.2:1.1.2 -google-cloud-containeranalysis:1.1.2:1.1.2 +proto-google-cloud-containeranalysis-v1:1.1.3:1.1.3 +proto-google-cloud-containeranalysis-v1beta1:0.87.3:0.87.3 +grpc-google-cloud-containeranalysis-v1beta1:0.87.3:0.87.3 +grpc-google-cloud-containeranalysis-v1:1.1.3:1.1.3 +google-cloud-containeranalysis:1.1.3:1.1.3