Merge pull request #445 from jenkins-x/dirty-github

fix: add github api value for conflict
jenkins-x · May 17, 2024 · ded4738 · ded4738
2 parents 94c4fe1 + 66ad2cc
commit ded4738
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/scm/driver/github/testdata/webhooks/pr_closed.json.golden b/scm/driver/github/testdata/webhooks/pr_closed.json.golden
@@ -72,6 +72,7 @@
  "State": "closed",
  "Closed": true,
  "Merged": false,
+ "MergeableState": "conflicting",
  "Author": {
  "ID": 817538,
  "Login": "bradrydzewski",

diff --git a/scm/driver/github/testdata/webhooks/pr_edited.json.golden b/scm/driver/github/testdata/webhooks/pr_edited.json.golden
@@ -72,6 +72,7 @@
  "State": "open",
  "Closed": false,
  "Merged": false,
+ "MergeableState": "conflicting",
  "Author": {
  "ID": 817538,
  "Login": "bradrydzewski",

diff --git a/scm/driver/github/testdata/webhooks/pr_labeled.json.golden b/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
@@ -84,6 +84,7 @@
  "State": "open",
  "Closed": false,
  "Merged": false,
+ "MergeableState": "conflicting",
  "Author": {
  "ID": 817538,
  "Login": "bradrydzewski",

diff --git a/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden b/scm/driver/github/testdata/webhooks/pr_unlabeled.json.golden
@@ -77,6 +77,7 @@
  "State": "open",
  "Closed": false,
  "Merged": false,
+ "MergeableState": "conflicting",
  "Author": {
  "ID": 817538,
  "Login": "bradrydzewski",

diff --git a/scm/pr.go b/scm/pr.go
@@ -215,7 +215,7 @@ func ToMergeableState(text string) MergeableState {
  switch strings.ToLower(text) {
  case "clean", "mergeable", "can_be_merged":
  return MergeableStateMergeable
- case "conflict", "conflicting", "cannot_be_merged":
+ case "dirty", "conflict", "conflicting", "cannot_be_merged":
  return MergeableStateConflicting
  default:
  return MergeableStateUnknown