Skip to content

feat: Support automatic retries for runner removal #252

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

Open
humzam wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Support automatic retries for runner removal #252

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
3e3e585
feat: enhance runner removal with retry logic and error handling
humzam Dec 31, 2025
00624a9
update dist
humzam Dec 31, 2025
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
41 changes: 34 additions & 7 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145446,6 +145446,13 @@ async function getRegistrationToken() {
}
}

function isRetryableError(error) {
if (!error.status) return false;

// Retry on server errors and rate limits
return error.status >= 500 || error.status === 429;
}

async function removeRunner() {
const runner = await getRunner(config.input.label);
const octokit = github.getOctokit(config.input.githubToken);
Expand All @@ -145456,13 +145463,33 @@ async function removeRunner() {
return;
}

try {
await octokit.request('DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}', _.merge(config.githubContext, { runner_id: runner.id }));
core.info(`GitHub self-hosted runner ${runner.name} is removed`);
return;
} catch (error) {
core.error('GitHub self-hosted runner removal error');
throw error;
const maxRetries = 3;
const baseDelayMs = 1000;

for (let attempt = 1; attempt <= maxRetries; attempt++) {
try {
await octokit.request('DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}', _.merge(config.githubContext, { runner_id: runner.id }));
core.info(`GitHub self-hosted runner ${runner.name} is removed`);
return;
} catch (error) {
const isLastAttempt = attempt === maxRetries;

// If runner not found, consider it success (already removed)
if (error.status === 404) {
core.info(`GitHub self-hosted runner ${runner.name} was already removed`);
return;
}

if (!isRetryableError(error) || isLastAttempt) {
core.error(`GitHub self-hosted runner removal error after ${attempt} attempts (HTTP ${error.status}): ${error.message || error}`);
throw error;
}

// Exponential backoff with jitter
const delayMs = baseDelayMs * Math.pow(2, attempt - 1) + Math.random() * 1000;
core.info(`GitHub runner removal attempt ${attempt} failed (${error.status}), retrying in ${Math.round(delayMs)}ms...`);
await new Promise(r => setTimeout(r, delayMs));
}
}
}

Expand Down
41 changes: 34 additions & 7 deletions src/gh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ async function getRegistrationToken() {
}
}

function isRetryableError(error) {
if (!error.status) return false;

// Retry on server errors and rate limits
return error.status >= 500 || error.status === 429;
}

async function removeRunner() {
const runner = await getRunner(config.input.label);
const octokit = github.getOctokit(config.input.githubToken);
Expand All @@ -41,13 +48,33 @@ async function removeRunner() {
return;
}

try {
await octokit.request('DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}', _.merge(config.githubContext, { runner_id: runner.id }));
core.info(`GitHub self-hosted runner ${runner.name} is removed`);
return;
} catch (error) {
core.error('GitHub self-hosted runner removal error');
throw error;
const maxRetries = 3;
const baseDelayMs = 1000;

for (let attempt = 1; attempt <= maxRetries; attempt++) {
try {
await octokit.request('DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}', _.merge(config.githubContext, { runner_id: runner.id }));
core.info(`GitHub self-hosted runner ${runner.name} is removed`);
return;
} catch (error) {
const isLastAttempt = attempt === maxRetries;

// If runner not found, consider it success (already removed)
if (error.status === 404) {
core.info(`GitHub self-hosted runner ${runner.name} was already removed`);
return;
}

if (!isRetryableError(error) || isLastAttempt) {
core.error(`GitHub self-hosted runner removal error after ${attempt} attempts (HTTP ${error.status}): ${error.message || error}`);
throw error;
}

// Exponential backoff with jitter
const delayMs = baseDelayMs * Math.pow(2, attempt - 1) + Math.random() * 1000;
core.info(`GitHub runner removal attempt ${attempt} failed (${error.status}), retrying in ${Math.round(delayMs)}ms...`);
await new Promise(r => setTimeout(r, delayMs));
}
}
}

Expand Down