DevInfra/act_gitea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Support graceful job step cancellation (#2714)

Browse Source 
* feat: Support graceful job step cancellation

* for gh-act-runner
* act-cli support as well
* respecting always() and cancelled() of steps

* change main

* cancel startContainer / gh cli / bugreport early

* add to watch as well

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
ChristopherHX
2025-03-29 18:00:37 +01:00
committed by GitHub
parent 517c3ac467
commit bea04dd8f9
8 changed files with 241 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/runner/step.go
View File

@@ -85,6 +85,9 @@ func runStepExecutor(step step, stage stepStage, executor common.Executor) commo
return err
}
cctx := common.JobCancelContext(ctx)
rc.Cancelled = cctx != nil && cctx.Err() != nil
runStep, err := isStepEnabled(ctx, ifExpression, step, stage)
if err != nil {
stepResult.Conclusion = model.StepStatusFailure
@@ -140,10 +143,14 @@ func runStepExecutor(step step, stage stepStage, executor common.Executor) commo
Mode: 0o666,
})(ctx)
timeoutctx, cancelTimeOut := evaluateStepTimeout(ctx, rc.ExprEval, stepModel)
stepCtx, cancelStepCtx := context.WithCancel(ctx)
defer cancelStepCtx()
var cancelTimeOut context.CancelFunc
stepCtx, cancelTimeOut = evaluateStepTimeout(stepCtx, rc.ExprEval, stepModel)
defer cancelTimeOut()
monitorJobCancellation(ctx, stepCtx, cctx, rc, logger, ifExpression, step, stage, cancelStepCtx)
startTime := time.Now()
err = executor(timeoutctx)
err = executor(stepCtx)
executionTime := time.Since(startTime)
if err == nil {
@@ -192,6 +199,24 @@ func runStepExecutor(step step, stage stepStage, executor common.Executor) commo
}
}
func monitorJobCancellation(ctx context.Context, stepCtx context.Context, jobCancellationCtx context.Context, rc *RunContext, logger logrus.FieldLogger, ifExpression string, step step, stage stepStage, cancelStepCtx context.CancelFunc) {
if !rc.Cancelled && jobCancellationCtx != nil {
go func() {
select {
case <-jobCancellationCtx.Done():
rc.Cancelled = true
logger.Infof("Reevaluate condition %v due to cancellation", ifExpression)
keepStepRunning, err := isStepEnabled(ctx, ifExpression, step, stage)
logger.Infof("Result condition keepStepRunning=%v", keepStepRunning)
if !keepStepRunning || err != nil {
cancelStepCtx()
}
case <-stepCtx.Done():
}
}()
}
}
func evaluateStepTimeout(ctx context.Context, exprEval ExpressionEvaluator, stepModel *model.Step) (context.Context, context.CancelFunc) {
timeout := exprEval.Interpolate(ctx, stepModel.TimeoutMinutes)
if timeout != "" {