Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ Each of the following helpers are defined in a file of the same name in `src/hel
- If `login` is provided, it does nothing if that user is already part of the team
- You can also pass a `slack_webhook_url` to notify the assignees that they are assigned to the PR!

### [check-merge-safety](.github/workflows/check-merge-safety.yml)
### [~~check-merge-safety~~](.github/workflows/check-merge-safety.yml) (DEPRECATED)

> **Deprecated:** This helper is deprecated. Please use [GitHub's native merge queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) instead.

- Checks if a PR branch needs to update with the default branch prior to merging (great for monorepos!)
- If this check succeeds for a PR, the PR is safe to merge right away!
Expand Down Expand Up @@ -286,7 +288,9 @@ Additionally, the following parameters can be used for additional control over t
- Adds a 'due soon' label to issues with a priority label that will become overdue in 7 days
- Adds an 'overdue' label to issues with a priority label that are overdue

### [manage-merge-queue](.github/workflows/manage-merge-queue.yml)
### [~~manage-merge-queue~~](.github/workflows/manage-merge-queue.yml) (DEPRECATED)

> **Deprecated:** This helper is deprecated. Please use [GitHub's native merge queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) instead.

- Manages a queue for PRs as follows:
- Adding the `READY TO MERGE` label to a PR will add the PR to the "merge queue", represented by a `QUEUED FOR MERGE #X` label. Removing `READY TO MERGE` will remove this label and thus remove the PR from the queue.
Expand Down
3 changes: 2 additions & 1 deletion dist/helpers/check-merge-safety.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ var COMMENT_PATHS_MARKER = "<!-- check-merge-safety-paths -->";
class CheckMergeSafety extends HelperInputs {
}
var checkMergeSafety = async (inputs) => {
warning("check-merge-safety is deprecated. Please use GitHub's native merge queue: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue");
const isPrWorkflow = Boolean(context.issue.number);
if (!isPrWorkflow) {
return handlePushWorkflow(inputs);
Expand Down Expand Up @@ -258,4 +259,4 @@ export {
CheckMergeSafety
};

//# debugId=8CCB3211353B88AF64756E2164756E21
//# debugId=F4EC41763AC4ABEC64756E2164756E21
6 changes: 3 additions & 3 deletions dist/helpers/check-merge-safety.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/helpers/manage-merge-queue.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
enableAutoMerge,
manageMergeQueue,
removePrFromQueue
} from "../main-1dad8qjs.js";
} from "../main-yrwb8zcb.js";
import"../main-f57sjs6g.js";
import"../main-fk67p72v.js";
import"../main-3vz73ekb.js";
Expand Down
2 changes: 1 addition & 1 deletion dist/helpers/prepare-queued-pr-for-merge.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
prepareQueuedPrForMerge,
updatePrWithDefaultBranch
} from "../main-1dad8qjs.js";
} from "../main-yrwb8zcb.js";
import"../main-f57sjs6g.js";
import"../main-fk67p72v.js";
import"../main-3vz73ekb.js";
Expand Down
3 changes: 2 additions & 1 deletion dist/main-1dad8qjs.js → dist/main-yrwb8zcb.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ var manageMergeQueue = async ({
allow_only_for_maintainers,
pattern
} = {}) => {
warning("manage-merge-queue is deprecated. Please use GitHub's native merge queue: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue");
const { data: pullRequest } = await octokit.pulls.get({ pull_number: context.issue.number, ...context.repo });
if (pullRequest.merged || !pullRequest.labels.find((label) => label.name === READY_FOR_MERGE_PR_LABEL)) {
info("This PR is not in the merge queue.");
Expand Down Expand Up @@ -304,4 +305,4 @@ var updatePrWithDefaultBranch = async (pullRequest) => {

export { prepareQueuedPrForMerge, updatePrWithDefaultBranch, ManageMergeQueue, manageMergeQueue, removePrFromQueue, enableAutoMerge };

//# debugId=89067C53C7C247CA64756E2164756E21
//# debugId=37FACE3969ED272964756E2164756E21
6 changes: 3 additions & 3 deletions dist/main-1dad8qjs.js.map → dist/main-yrwb8zcb.js.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/helpers/check-merge-safety.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ export class CheckMergeSafety extends HelperInputs {
}

export const checkMergeSafety = async (inputs: CheckMergeSafety) => {
core.warning(
"check-merge-safety is deprecated. Please use GitHub's native merge queue: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue"
);
const isPrWorkflow = Boolean(githubContext.issue.number);
if (!isPrWorkflow) {
return handlePushWorkflow(inputs);
Expand Down
3 changes: 3 additions & 0 deletions src/helpers/manage-merge-queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ export const manageMergeQueue = async ({
allow_only_for_maintainers,
pattern
}: ManageMergeQueue = {}) => {
core.warning(
"manage-merge-queue is deprecated. Please use GitHub's native merge queue: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue"
);
const { data: pullRequest } = await octokit.pulls.get({ pull_number: context.issue.number, ...context.repo });
if (pullRequest.merged || !pullRequest.labels.find(label => label.name === READY_FOR_MERGE_PR_LABEL)) {
core.info('This PR is not in the merge queue.');
Expand Down
Loading