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

Update auto-merge.yml #23

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Update auto-merge.yml #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 3 additions & 58 deletions .github/workflows/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,66 +34,11 @@ jobs:
core.setOutput("shouldMerge", "false");
return;
}

// Retrieve the combined status for the PR's latest commit.
const { data: combinedStatus } = await github.rest.repos.getCombinedStatusForRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: pr.head.sha
});
core.info(`Combined status state: ${combinedStatus.state}`);

// Only merge if all status checks have passed.
if (combinedStatus.state !== 'success') {
core.info("Not all status checks have passed. Skipping auto-merge.");
core.setOutput("shouldMerge", "false");
return;
}

core.info("All conditions met. PR is eligible for auto-merge.");
core.setOutput("shouldMerge", "true");
result-encoding: string

- name: Wait for checks to pass
if: steps.check.outputs.shouldMerge == 'true'
uses: actions/github-script@v6
with:
script: |
const prNumber = context.payload.pull_request.number;
const { data: pr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber
});

// Wait for status checks to pass.
let checksPending = true;
let retries = 0;
const maxRetries = 20;
const waitTime = 30000;

while (checksPending && retries < maxRetries) {
const { data: combinedStatus } = await github.rest.repos.getCombinedStatusForRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: pr.head.sha
});

if (combinedStatus.state === 'success') {
checksPending = false;
} else {
core.info(`Checks still pending. Waiting... (${retries + 1}/${maxRetries})`);
await new Promise(resolve => setTimeout(resolve, waitTime));
retries++;
}
}

if (checksPending) {
throw new Error("Checks did not complete successfully within the time limit.");
}
// Skip combined status check and proceed to auto-merge.
core.info("Skipping status checks. Proceeding with auto-merge.");
core.setOutput("shouldMerge", "true");

core.info("All checks passed.");

- name: Auto-Merge PR
if: steps.check.outputs.shouldMerge == 'true'
uses: actions/github-script@v6
Expand Down