Revert "Port master to release branch (#1277)"

5ed80c753b
This commit is contained in:
Thomas Boop
2021-08-19 11:27:05 -04:00
parent 409920e9f0
commit 28d01a0160
3 changed files with 86 additions and 93 deletions

View File

@@ -2,10 +2,12 @@
## Bugs ## Bugs
- Fixed an issue where composite steps would not run on `failure()` or `always()` when the job failed (#1273) - Send Path when resolving actions so we can correctly validate Policy for Composite Actions (#1250)
## Misc ## Misc
- Allows flags instead of parameters when configuring the runner (#1220)
## Windows x64 ## Windows x64
We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows. We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.

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)

View File

@@ -1 +1 @@
2.280.3 2.280.2