Skip to content

cherry-pick(v0.17.0-beta13): #5586 #5594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mindlesscloud merged 1 commit into from
Jun 28, 2023
Merged

cherry-pick(v0.17.0-beta13): #5586 #5594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions backend/core/runner/run_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package runner
import (
gocontext "context"
"fmt"
"time"

"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
Expand All @@ -30,7 +32,6 @@ import (
"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
contextimpl "github.com/apache/incubator-devlake/impls/context"
"github.com/apache/incubator-devlake/impls/logruslog"
"time"
)

// RunTask FIXME ...
Expand Down Expand Up @@ -113,8 +114,8 @@ func RunTask(
if dbe != nil {
logger.Error(dbe, "update pipeline state failed")
}
// not return err if the `SkipOnFail` is true
if dbPipeline.SkipOnFail {
// not return err if the `SkipOnFail` is true and the error is not canceled
if dbPipeline.SkipOnFail && !errors.Is(err, gocontext.Canceled) {
err = nil
}
}()
Expand Down