Skip to content

Break out branch limiting instructions #1929

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

MelissaKaulfuss
Copy link
Contributor

As per feedback from @timriley, I propose moving the optional branch limiting filter to it's own section. Github Merge Queues will work out of the box with the first steps, users only need to add the filter pattern if they already have existing branch limiting filters.

As per feedback from @timriley, I propose moving the optional branch limiting filter to it's own section. Github Merge Queues will work out of the box with the first steps, users only need to add the filter pattern if they already have existing branch limiting filters.
@render
Copy link

render bot commented Mar 9, 2023

@github-actions github-actions bot added the pipelines Pull requests that update content related to Pipelines label Mar 9, 2023
Copy link
Contributor

@timriley timriley left a comment

Choose a reason for hiding this comment

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

This looks good to me, @MelissaKaulfuss!

Copy link
Contributor

@mbelton-buildkite mbelton-buildkite left a comment

Choose a reason for hiding this comment

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

One suggestion to avoid repetition, and an update to the intro paragraph to match the change.

Comment on lines +22 to 27

If you have existing branch limiting rules:

1. From your Buildkite dashboard, select your pipeline.
1. Select _Pipeline Settings_ > _GitHub_.
1. In the _Branch Limiting_ section, add a filter for the following pattern:
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be good to avoid having to repeat the navigation instructions. What do you think about keeping it as one list, but outlining when you need to make changes to the branch limiting rules? Thinking:

Suggested change
If you have existing branch limiting rules:
1. From your Buildkite dashboard, select your pipeline.
1. Select _Pipeline Settings_ > _GitHub_.
1. In the _Branch Limiting_ section, add a filter for the following pattern:
1. In the _Branch Limiting_ section, check whether there are any existing branch filter patterns.
- If none, you don't need to do anything further.
- If there are existing patterns, add a filter for the following pattern:

Comment on lines 30 to 31
gh-readonly-queue/{base_branch}/*
```
Copy link
Contributor

Choose a reason for hiding this comment

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

If using my suggestion to keep one list, you'll need to update the indentation here:

Suggested change
gh-readonly-queue/{base_branch}/*
```
gh-readonly-queue/{base_branch}/*
```

Note, the line above also needs updating to match, but I can't comment on it.

@@ -16,6 +16,12 @@ The merge queue creates temporary branches with a special prefix to validate pul

Copy link
Contributor

Choose a reason for hiding this comment

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

I can't comment on it, but let's update the ordering of the intro paragraph for the steps on line 15 to align with the updated instructions. Thinking:

The merge queue creates temporary branches with a special prefix to validate pull request changes. To avoid these temporary branches triggering multiple builds on the same pipeline for the same commit, we recommend enabling the option to skip builds on existing commits.

If you already use branch limiting rules in the pipeline, you must also add a filter to match branches with the special prefix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pipelines Pull requests that update content related to Pipelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants