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.

Sign up for GitHub

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

ci: prevent breakage when including certain commands in the PR #4751

Merged
merged 2 commits into from
Aug 9, 2024
Merged

ci: prevent breakage when including certain commands in the PR #4751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b40a6c0
ci: detect `[skip ci]` in PR descriptions and prevent breakage
nixpanic Aug 7, 2024
f92edd6
doc: add description of Mergify commands for merging a PR
nixpanic Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,3 +464,17 @@ pull_request_rules:
- Repo activity
- ci/skip/e2e
- ci/skip/multi-arch-build

# A [skip ci] in the PR description prevents Jenkins jobs from running, mark
# the PR as Draft so that CI jobs do not automatically run anymore.
- name: detect [skip ci] in the PR description
conditions:
- "body-raw~=[skip ci]"
actions:
edit:
draft: true
comment:
# yamllint disable-line rule:truthy
message: "The PR description contains the unsupported `[skip ci]`
command, please update the description and mark the PR ready for review
again."
7 changes: 5 additions & 2 deletions docs/development-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,11 @@ need to be met before it will be merged:
on the PR. The bot will merge the PR if it's having one approval and the
label `ready-to-merge`.

When the criteria are met, a project maintainer can merge your changes into
the project's devel branch.
When the criteria are met, a project maintainer can instruct the Mergify bot to
queue the PR for merging. This usually is done by leaving two comments:

* `@mergifyio rebase` to rebase on the latest HEAD of the branch
* `@mergifyio queue` once the rebasing is done, to add the PR to the merge queue

### Backport a Fix to a Release Branch

Expand Down