From dc4b83df25b629fe219513e08872948366a5416c Mon Sep 17 00:00:00 2001 From: andridzi Date: Tue, 22 Oct 2024 23:43:19 +0300 Subject: [PATCH 1/2] fix: Set `success` Git commit status in case of skipped checks --- pkg/commitState.go | 3 +++ pkg/vcs/github_client/client.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/commitState.go b/pkg/commitState.go index 3da4de1a..3658e895 100644 --- a/pkg/commitState.go +++ b/pkg/commitState.go @@ -30,6 +30,7 @@ func (s CommitState) BareString() string { var stateString = map[CommitState]string{ StateNone: "", + StateSkip: "Skipped", StateSuccess: "Passed", StateRunning: "Running", StateWarning: "Warning", @@ -62,6 +63,8 @@ func ParseCommitState(s string) (CommitState, error) { return StateError, nil case "panic": return StatePanic, nil + case "skip", "skipped": + return StateSkip, nil default: return StateNone, fmt.Errorf("unknown commit state: %s", s) diff --git a/pkg/vcs/github_client/client.go b/pkg/vcs/github_client/client.go index 6b53fd78..e88b6769 100644 --- a/pkg/vcs/github_client/client.go +++ b/pkg/vcs/github_client/client.go @@ -181,7 +181,7 @@ func toGithubCommitStatus(state pkg.CommitState) *string { return pkg.Pointer("failure") case pkg.StateRunning: return pkg.Pointer("pending") - case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone: + case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip: return pkg.Pointer("success") } From 651839d5b6958a33d68d014bdd8af014ecf16d98 Mon Sep 17 00:00:00 2001 From: andridzi Date: Wed, 23 Oct 2024 00:05:42 +0300 Subject: [PATCH 2/2] do not forget about gitlab --- pkg/vcs/gitlab_client/status.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/vcs/gitlab_client/status.go b/pkg/vcs/gitlab_client/status.go index d17188bb..d3794332 100644 --- a/pkg/vcs/gitlab_client/status.go +++ b/pkg/vcs/gitlab_client/status.go @@ -69,7 +69,7 @@ func convertState(state pkg.CommitState) gitlab.BuildStateValue { return gitlab.Running case pkg.StateFailure, pkg.StateError, pkg.StatePanic: return gitlab.Failed - case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone: + case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip: return gitlab.Success }