Compare commits

..

2 Commits

Author SHA1 Message Date
Thomas Boop
10b624dd10 update release notes and runner version 2021-08-19 11:28:01 -04:00
Thomas Boop
28d01a0160 Revert "Port master to release branch (#1277)"
5ed80c753b
2021-08-19 11:27:05 -04:00
2 changed files with 83 additions and 92 deletions

View File

@@ -2,7 +2,7 @@
## Bugs ## Bugs
- Fixed an issue where composite steps would not run on `failure()` or `always()` when the job failed (#1273) - Reverts (#1273) as the behavior was unexpected.
## Misc ## Misc

View File

@@ -294,14 +294,6 @@ namespace GitHub.Runner.Worker.Handlers
// Register Callback // Register Callback
CancellationTokenRegistration? jobCancelRegister = null; CancellationTokenRegistration? jobCancelRegister = null;
try try
{
// For main steps just run the action
if (stage == ActionRunStage.Main)
{
await RunStepAsync(step);
}
// We need to evaluate conditions for pre/post steps
else
{ {
// Register job cancellation call back only if job cancellation token not been fire before each step run // Register job cancellation call back only if job cancellation token not been fire before each step run
if (!ExecutionContext.Root.CancellationToken.IsCancellationRequested) if (!ExecutionContext.Root.CancellationToken.IsCancellationRequested)
@@ -397,7 +389,6 @@ namespace GitHub.Runner.Worker.Handlers
await RunStepAsync(step); await RunStepAsync(step);
} }
} }
}
finally finally
{ {
if (jobCancelRegister != null) if (jobCancelRegister != null)