Add Automerge workflow by TomCools · Pull Request #605 · dapr/java-sdk

TomCools · 2021-08-20T23:33:35Z

Description

The automerge workflow will check for complete and approved pull requests and will merge them automatically.

Sources:
Based myself on the scripts int he dapr/dapr repository.

For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge", you may want to align this across repos?)
https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue)

Issue reference

We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.

Please reference the issue this PR will close: #603

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

Code compiles correctly
Created/updated tests
Extended the documentation
Discuss wether we should use the "auto-merge" label as was requested in the issue, or we allign on "automerge" like the dapr/dapr repository @artursouza, since you requested 603, you tell me.

The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves dapr#603

codecov · 2021-08-21T00:09:09Z

Codecov Report

Merging #605 (dc7df88) into master (34bf149) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master     #605   +/-   ##
=========================================
  Coverage     77.03%   77.03%           
  Complexity      941      941           
=========================================
  Files            88       88           
  Lines          3009     3009           
  Branches        334      334           
=========================================
  Hits           2318     2318           
  Misses          528      528           
  Partials        163      163

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 34bf149...dc7df88. Read the comment docs.

* Add Automerge workflow The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves dapr#603 * Update automerge-bot.yml * Update automerge-bot.yml Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

@PostMapping

* Upgrade Mockito to latest version * Run GitHub Actions on Java 11 and 16 * Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED` * Move Surefire JVM arguments to Maven property * Update build.yml * Update validate.yml * simplily build singleton dapr http (#590) Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Add Automerge workflow (#605) * Add Automerge workflow The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves #603 * Update automerge-bot.yml * Update automerge-bot.yml Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Cleanup Maven POM files (#604) Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version. Also fixed some indenting and removed duplicate declarations. Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> * Add support for @PostMapping("/path") to pub/sub topic subscriptions (#583) * Remove duplicate dependency * Transform into managed dependencies * Remove old JUnit version from dependencies * Add tests for DaprBeanPostProcessor * Also register PostMappings that use value * Modify existing pub/sub test to no use @PostMapping(path="...") * Remove added dependencies on AssertJ, Spring Test and Servlet API * Remove test in favour of the sdk-tests one Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules Co-authored-by: Artur Souza <artursouza.ms@outlook.com> Co-authored-by: 浩 <inf2inf2@outlook.com> Co-authored-by: Tom Cools <tom.cools@live.be> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>

@PostMapping

* Upgrade Mockito to latest version * Run GitHub Actions on Java 11 and 16 * Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED` * Move Surefire JVM arguments to Maven property * Update build.yml * Update validate.yml * simplily build singleton dapr http (dapr#590) Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Add Automerge workflow (dapr#605) * Add Automerge workflow The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves dapr#603 * Update automerge-bot.yml * Update automerge-bot.yml Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Cleanup Maven POM files (dapr#604) Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version. Also fixed some indenting and removed duplicate declarations. Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> * Add support for @PostMapping("/path") to pub/sub topic subscriptions (dapr#583) * Remove duplicate dependency * Transform into managed dependencies * Remove old JUnit version from dependencies * Add tests for DaprBeanPostProcessor * Also register PostMappings that use value * Modify existing pub/sub test to no use @PostMapping(path="...") * Remove added dependencies on AssertJ, Spring Test and Servlet API * Remove test in favour of the sdk-tests one Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules Co-authored-by: Artur Souza <artursouza.ms@outlook.com> Co-authored-by: 浩 <inf2inf2@outlook.com> Co-authored-by: Tom Cools <tom.cools@live.be> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Signed-off-by: zjx244729 <zjx244729@alibaba-inc.com>

* Add Automerge workflow The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves dapr#603 * Update automerge-bot.yml * Update automerge-bot.yml Co-authored-by: Artur Souza <artursouza.ms@outlook.com> Signed-off-by: zjx244729 <zjx244729@alibaba-inc.com>

@PostMapping

* Upgrade Mockito to latest version * Run GitHub Actions on Java 11 and 16 * Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED` * Move Surefire JVM arguments to Maven property * Update build.yml * Update validate.yml * simplily build singleton dapr http (dapr#590) Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Add Automerge workflow (dapr#605) * Add Automerge workflow The automerge workflow will check for complete and approved pull requests and will merge them automatically. Sources: - For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge") - https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue. Resolves dapr#603 * Update automerge-bot.yml * Update automerge-bot.yml Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Cleanup Maven POM files (dapr#604) Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version. Also fixed some indenting and removed duplicate declarations. Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> * Add support for @PostMapping("/path") to pub/sub topic subscriptions (dapr#583) * Remove duplicate dependency * Transform into managed dependencies * Remove old JUnit version from dependencies * Add tests for DaprBeanPostProcessor * Also register PostMappings that use value * Modify existing pub/sub test to no use @PostMapping(path="...") * Remove added dependencies on AssertJ, Spring Test and Servlet API * Remove test in favour of the sdk-tests one Co-authored-by: Artur Souza <artursouza.ms@outlook.com> * Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules Co-authored-by: Artur Souza <artursouza.ms@outlook.com> Co-authored-by: 浩 <inf2inf2@outlook.com> Co-authored-by: Tom Cools <tom.cools@live.be> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Signed-off-by: zjx244729 <zjx244729@alibaba-inc.com>

TomCools requested review from a team as code owners August 20, 2021 23:33

TomCools and others added 3 commits August 21, 2021 01:33

Merge branch 'master' into issue/603

294f82c

Update automerge-bot.yml

1206962

Update automerge-bot.yml

dc7df88

artursouza approved these changes Aug 21, 2021

View reviewed changes

artursouza merged commit a9397ab into dapr:master Aug 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add Automerge workflow#605

Add Automerge workflow#605
artursouza merged 4 commits into
dapr:masterfrom
TomCools:issue/603

TomCools commented Aug 20, 2021 •

edited

Loading

Uh oh!

codecov Bot commented Aug 21, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

TomCools commented Aug 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issue reference

Checklist

Uh oh!

codecov Bot commented Aug 21, 2021

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

TomCools commented Aug 20, 2021 •

edited

Loading