Skip to content

Commit

Permalink
Merge pull request #8 from mercedes-benz/cherry_pick_cancelled_typo_fix
Browse files Browse the repository at this point in the history
fix: use the american english type of cancelled
Signed-off-by: Mario Constanti <[email protected]>
  • Loading branch information
bavarianbidi committed Jun 5, 2024
2 parents 2497686 + 94b3310 commit 3f25957
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions runner/pool/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ func (r *basePoolManager) startLoopForFunction(f func() error, interval time.Dur
// this worker was stopped.
return
default:
r.waitForTimeoutOrCanceled(common.BackoffTimer)
r.waitForTimeoutOrCancelled(common.BackoffTimer)
}
}
}
Expand All @@ -336,7 +336,7 @@ func (r *basePoolManager) updateTools() error {
slog.With(slog.Any("error", err)).ErrorContext(
r.ctx, "failed to update tools for repo")
r.setPoolRunningState(false, err.Error())
r.waitForTimeoutOrCanceled(common.BackoffTimer)
r.waitForTimeoutOrCancelled(common.BackoffTimer)
return fmt.Errorf("failed to update tools for repo %s: %w", r.helper.String(), err)
}
r.mux.Lock()
Expand Down Expand Up @@ -841,7 +841,7 @@ func (r *basePoolManager) Status() params.PoolManagerStatus {
}
}

func (r *basePoolManager) waitForTimeoutOrCanceled(timeout time.Duration) {
func (r *basePoolManager) waitForTimeoutOrCancelled(timeout time.Duration) {
slog.DebugContext(
r.ctx, fmt.Sprintf("sleeping for %.2f minutes", timeout.Minutes()))
select {
Expand Down Expand Up @@ -956,9 +956,9 @@ func (r *basePoolManager) getRunnerDetailsFromJob(job params.WorkflowJob) (param

var err error
if job.WorkflowJob.RunnerName == "" {
if job.WorkflowJob.Conclusion == "skipped" || job.WorkflowJob.Conclusion == "canceled" {
// job was skipped or canceled before a runner was allocated. No point in continuing.
return params.RunnerInfo{}, fmt.Errorf("job %d was skipped or canceled before a runner was allocated: %w", job.WorkflowJob.ID, runnerErrors.ErrNotFound)
if job.WorkflowJob.Conclusion == "skipped" || job.WorkflowJob.Conclusion == "cancelled" {
// job was skipped or cancelled before a runner was allocated. No point in continuing.
return params.RunnerInfo{}, fmt.Errorf("job %d was skipped or cancelled before a runner was allocated: %w", job.WorkflowJob.ID, runnerErrors.ErrNotFound)
}
// Runner name was not set in WorkflowJob by github. We can still attempt to
// fetch the info we need, using the workflow run ID, from the API.
Expand Down Expand Up @@ -1020,7 +1020,7 @@ func (r *basePoolManager) paramsWorkflowJobToParamsJob(job params.WorkflowJob) (

runnerName := job.WorkflowJob.RunnerName
if job.Action != "queued" && runnerName == "" {
if job.WorkflowJob.Conclusion != "skipped" && job.WorkflowJob.Conclusion != "canceled" {
if job.WorkflowJob.Conclusion != "skipped" && job.WorkflowJob.Conclusion != "cancelled" {
// Runner name was not set in WorkflowJob by github. We can still attempt to fetch the info we need,
// using the workflow run ID, from the API.
// We may still get no runner name. In situations such as jobs being cancelled before a runner had the chance
Expand Down

0 comments on commit 3f25957

Please sign in to comment.