Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto merge patch dependency updates #10333

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Auto merge patch dependency updates #10333

merged 1 commit into from
Sep 14, 2022

Conversation

npepinpe
Copy link
Member

@npepinpe npepinpe commented Sep 12, 2022

Description

This PR adds a workflow which runs on every dependabot PRs, and will automatically merge the PR iff the checks pass, and it is a patch version (according to dependabot). Merging is still done via bors.

The workflow is made of three steps: checking the dependabot metadata (used to determine the type of updates, e.g. patch, minor, etc.), waiting for specific checks to pass, then approving the PR with a bors merge comment (triggering the merge).

If bors fails to merge, or checks fail, then manual action is still required.

Related issues

closes #10295

Definition of Done

Not all items need to be done depending on the issue and the pull request.

Code changes:

  • The changes are backwards compatibility with previous versions
  • If it fixes a bug then PRs are created to backport the fix to the last two minor versions. You can trigger a backport by assigning labels (e.g. backport stable/1.3) to the PR, in case that fails you need to create backports manually.

Testing:

  • There are unit/integration tests that verify all acceptance criterias of the issue
  • New tests are written to ensure backwards compatibility with further versions
  • The behavior is tested manually
  • The change has been verified by a QA run
  • The impact of the changes is verified by a benchmark

Documentation:

  • The documentation is updated (e.g. BPMN reference, configuration, examples, get-started guides, etc.)
  • New content is added to the release announcement
  • If the PR changes how BPMN processes are validated (e.g. support new BPMN element) then the Camunda modeling team should be informed to adjust the BPMN linting.

Please refer to our review guidelines.

@npepinpe npepinpe closed this Sep 12, 2022
@npepinpe npepinpe reopened this Sep 12, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Sep 12, 2022

Test Results

   859 files  ±    0     859 suites  ±0   1h 38m 48s ⏱️ + 1m 29s
6 633 tests +120  6 622 ✔️ +120  11 💤 ±0  0 ±0 
6 817 runs  +120  6 806 ✔️ +120  11 💤 ±0  0 ±0 

Results for commit 3c81194. ± Comparison against base commit 15c1814.

♻️ This comment has been updated with latest results.

@npepinpe npepinpe closed this Sep 13, 2022
@npepinpe npepinpe reopened this Sep 13, 2022
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging...NOT!

@npepinpe npepinpe force-pushed the 10295-auto-merge branch 3 times, most recently from 3170c75 to 429a22a Compare September 13, 2022 12:45
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

@zeebe-bors-camunda
Copy link
Contributor

🔒 Permission denied

Existing reviewers: click here to make github-actions[bot] a reviewer

@npepinpe
Copy link
Member Author

So all good, but it seems the GitHub bot is not an approved review ;)

@npepinpe
Copy link
Member Author

@npepinpe
Copy link
Member Author

npepinpe commented Sep 13, 2022

After merging, we would simply add the GitHub actions bot to the bors reviewers. If that's not desirable, we can use a PAT, but I can't see a reason why it won't be desirable.

@npepinpe
Copy link
Member Author

One last thing, I wasn't sure how to test the dependabot part without a dependabot PR, so we will find out on the first dependabot PR.

Copy link
Member

@korthout korthout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

👏 Nice work @npepinpe 🚀 I'm excited to see this work

Comment on lines +10 to +12
# Once we're using the merge queue feature, I think we can simplify this workflow a lot by relying
# on dependabot merging PRs via its commands, as it will always wait for checks to be green before
# merging.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Nice

- uses: actions/checkout@v3
- id: metadata
name: Fetch dependency metadata
if: false
Copy link
Member

@korthout korthout Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if: false, so this step is always skipped? If so, please clean it up.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that's a left over for testing, my bad 🙈

Adds a workflow which runs whenever a PR is opened, reopened, marked as
ready for review (so going from draft to ready), and updated
(synchronized). The latter is to allow things such as `@dependabot
rebase` to trigger this workflow.

This workflow runs only if the author of the PR is dependabot, and if
the repository is `camunda/zeebe`. It will only merge patch updates for
now, but it could be updated to merge any kind of updates.
@npepinpe
Copy link
Member Author

bors merge

zeebe-bors-camunda bot added a commit that referenced this pull request Sep 14, 2022
10333: Auto merge patch dependency updates r=npepinpe a=npepinpe

## Description

This PR adds a workflow which runs on every dependabot PRs, and will automatically merge the PR iff the checks pass, and it is a patch version (according to dependabot). Merging is still  done via bors.

The workflow is made of three steps: checking the dependabot metadata (used to determine the type of updates, e.g. patch, minor, etc.), waiting for specific checks to pass, then approving the PR with a `bors merge` comment (triggering the merge).

If bors fails to merge, or checks fail, then manual action is still required.

## Related issues

closes #10295



Co-authored-by: Nicolas Pepin-Perreault <nicolas.pepin-perreault@camunda.com>
@zeebe-bors-camunda
Copy link
Contributor

Timed out.

@npepinpe npepinpe merged commit 261d077 into main Sep 14, 2022
@npepinpe npepinpe deleted the 10295-auto-merge branch September 14, 2022 20:34
@korthout
Copy link
Member

korthout commented Sep 15, 2022

@Zelldon Zelldon added the version:8.1.0 Marks an issue as being completely or in parts released in 8.1.0 label Oct 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
version:8.1.0 Marks an issue as being completely or in parts released in 8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto merge green dependabot PRs
3 participants