From f31d7fe1603da99c6e4e0229451e9de0b5fb8d2a Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Mon, 14 Mar 2022 20:46:32 +0100 Subject: [PATCH] Revert: Don't stop JobContainer on failure (#1041) --- act/runner/job_executor.go | 9 ++++----- act/runner/job_executor_test.go | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/act/runner/job_executor.go b/act/runner/job_executor.go index 0c8cdb41..79d9399e 100644 --- a/act/runner/job_executor.go +++ b/act/runner/job_executor.go @@ -53,15 +53,14 @@ func newJobExecutor(info jobInfo) common.Executor { } steps = append(steps, func(ctx context.Context) error { - err := info.stopContainer()(ctx) - if err != nil { - return err - } - jobError := common.JobError(ctx) if jobError != nil { info.result("failure") } else { + err := info.stopContainer()(ctx) + if err != nil { + return err + } info.result("success") } diff --git a/act/runner/job_executor_test.go b/act/runner/job_executor_test.go index e22bc821..8417308b 100644 --- a/act/runner/job_executor_test.go +++ b/act/runner/job_executor_test.go @@ -103,7 +103,6 @@ func TestNewJobExecutor(t *testing.T) { executedSteps: []string{ "startContainer", "step1", - "stopContainer", "interpolateOutputs", "closeContainer", },