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 minor/patch version update by dependabot #732

Merged
1 commit merged into from
Apr 17, 2023

Conversation

remcowesterhoud
Copy link
Contributor

@remcowesterhoud remcowesterhoud commented Apr 14, 2023

Description

This step is copy-pasted from the Zeebe repository. It will run when the test-summary step has completed. If it did it means the PR can be merged.

Adding this makes it so once the CI has passed it automatically comments bors merge on the PR. This triggers bors to merge the PR. This removes the maintenance effort of manually having to merge the dependabot PRs.

Related issues

closes #

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

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

Documentation:

  • Javadoc has been written
  • The documentation is updated

This step is copy-pasted from the Zeebe repository.
It will run when the test-summary step has completed. If it did it means the PR can be merged.
@github-actions
Copy link

Test Results

  46 files   - 1    46 suites   - 1   1m 56s ⏱️ +6s
100 tests ±0  100 ✔️ ±0  0 💤 ±0  0 ±0 
320 runs   - 3  320 ✔️  - 3  0 💤 ±0  0 ±0 

Results for commit 0a0a537. ± Comparison against base commit cac8226.

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 👍

Let's give it a shot!

PS: Since the PR does not link to an issue, it would be beneficial to describe in the pull request body what this achieves (auto-merges for dependabot) and why that is useful

@remcowesterhoud
Copy link
Contributor Author

Thanks @korthout! I've edited the PR description.

bors merge

@ghost
Copy link

ghost commented Apr 17, 2023

Build succeeded:

@ghost ghost merged commit 6f22ee1 into main Apr 17, 2023
@ghost ghost deleted the automatically_merge_dependabot_prs branch April 17, 2023 08:29
@remcowesterhoud
Copy link
Contributor Author

/backport

@github-actions
Copy link

Git push to origin failed for stable/8.0 with exitcode 1

@github-actions
Copy link

Git push to origin failed for stable/8.1 with exitcode 1

@github-actions
Copy link

Git push to origin failed for stable/8.2 with exitcode 1

@korthout
Copy link
Member

/backport

@github-actions
Copy link

Backport failed for stable/8.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.0
git worktree add -d .worktree/backport-732-to-stable/8.0 origin/stable/8.0
cd .worktree/backport-732-to-stable/8.0
git checkout -b backport-732-to-stable/8.0
ancref=$(git merge-base cac8226ac30fd36316fe61fa5db5d5bb3e9d8c55 0a0a5379ec06ff34f0a9cde175e8347bfa3479a0)
git cherry-pick -x $ancref..0a0a5379ec06ff34f0a9cde175e8347bfa3479a0

@github-actions
Copy link

Backport failed for stable/8.1, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.1
git worktree add -d .worktree/backport-732-to-stable/8.1 origin/stable/8.1
cd .worktree/backport-732-to-stable/8.1
git checkout -b backport-732-to-stable/8.1
ancref=$(git merge-base cac8226ac30fd36316fe61fa5db5d5bb3e9d8c55 0a0a5379ec06ff34f0a9cde175e8347bfa3479a0)
git cherry-pick -x $ancref..0a0a5379ec06ff34f0a9cde175e8347bfa3479a0

@github-actions
Copy link

Backport failed for stable/8.2, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.2
git worktree add -d .worktree/backport-732-to-stable/8.2 origin/stable/8.2
cd .worktree/backport-732-to-stable/8.2
git checkout -b backport-732-to-stable/8.2
ancref=$(git merge-base cac8226ac30fd36316fe61fa5db5d5bb3e9d8c55 0a0a5379ec06ff34f0a9cde175e8347bfa3479a0)
git cherry-pick -x $ancref..0a0a5379ec06ff34f0a9cde175e8347bfa3479a0

@korthout
Copy link
Member

@remcowesterhoud There are conflicts

@remcowesterhoud
Copy link
Contributor Author

remcowesterhoud commented Jul 28, 2023

Yeah don't worry about it. It's already in those branches 🪄

@remcowesterhoud
Copy link
Contributor Author

I do have to add a fix though I just realised

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants