shopify-shipitnext[bot]
commented
1 year ago Shopify Merge Queue takes care of merging pull requests in this repository. Once you are ready to ship this PR, comment /shipit to enqueue this PR for merging.
If /shipit does not work, you can also ship PRs by going to your Shipit Next PR page and clicking on the Ship It button in the corner.
### Command Comments
- `/shipit`: Enqueue the PR for merging
- `/cancel`: Cancel an enqueued merge
- `/shipit --emergency`: Skip the queue and merge directly
### Merge process
Shopify Merge Queue will follow these steps to get a PR merged:
1. It will check whether this pull request follows our process and best practices. CI should be green, and the PR should have at least one approved review.
2. It places the PR in the queue. Other PRs that have been enqueued before will have priority.
3. Once it is this PR's turn, it will create merge commits of what `main` could look like after this PR is merged in combination with a batch of other PRs that are queued up.
4. It will then wait for CI to run on those merge commits. Once one of them comes back green, it will fast-forward the `main` branch to point to that commit. Your PR will be marked as merged.
5. Because CI already successfully ran on this merge commit, main is always green and the PR will be ready to be deployed right away.
This process will make sure that all PRs are treated equally when many are ready to be merged around the same time, and will make sure the CI status of the main branch is always green.
#### Notes
- Shopify Merge Queue publishes a CI status on your PR to keep you up to date with what is going on during the process.
- If anything goes wrong in this process, Shopify Merge Queue will leave a comment on the PR.
- Comment `/cancel` if you change your mind and want to stop the PR from being merged.
### Emergency merging
If, **in case of emergency**, you want to bypass the queue and get a PR merged as quickly as possible, `/shipit --emergency` instead. Shopify Merge Queue will ignore CI and reviews for the PR, and merge it directly to the main branch. Afterwards, somebody may ask you why this was an emergency that warranted skipping the queue.
Note that an emergency merge invalidates all merge commits that the merge queue created for other PRs, because they are based on a specific main SHA. Shopify Merge Queue will have to create new merge commits for those PRs based on the new main SHA, and restart CI on all of them. This reduces throughput significantly, so please only use the emergency procedure for real emergencies.
### Questions or feedback?
If you have any questions or feedback, please visit the [#help-eng-infrastructure](https://shopify.slack.com/archives/C01MXHNTT4Z) in Slack.
View more details at https://shipit-next.shopifycloud.com/Shopify/koa-shopify-auth/pull/166.
dependabot[bot]
Bumps ansi-regex from 4.1.0 to 4.1.1.
Commits
64735d2v4.1.175a657dFix potential ReDoS (#37)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/Shopify/koa-shopify-auth/network/alerts).