Skip to content

Commit b0a31bc

Browse files
authored
Merge pull request #2188 from Urgau/base-change-fix
Fix GitHub base change de-serialization
2 parents 86df7ae + e2f3ac2 commit b0a31bc

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/github.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,11 +1193,17 @@ pub struct ChangeInner {
11931193
pub from: String,
11941194
}
11951195

1196+
#[derive(Debug, serde::Deserialize)]
1197+
pub struct BaseChange {
1198+
pub r#ref: ChangeInner,
1199+
pub sha: ChangeInner,
1200+
}
1201+
11961202
#[derive(Debug, serde::Deserialize)]
11971203
pub struct Changes {
11981204
pub title: Option<ChangeInner>,
11991205
pub body: Option<ChangeInner>,
1200-
pub base: Option<ChangeInner>,
1206+
pub base: Option<BaseChange>,
12011207
}
12021208

12031209
#[derive(PartialEq, Eq, Debug, serde::Deserialize)]

src/handlers/check_commits.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,13 @@ r#":warning: **Warning** :warning:
515515
event.changes = Some(crate::github::Changes {
516516
title: None,
517517
body: None,
518-
base: Some(crate::github::ChangeInner {
519-
from: "master".to_string(),
518+
base: Some(crate::github::BaseChange {
519+
r#ref: crate::github::ChangeInner {
520+
from: "master".to_string(),
521+
},
522+
sha: crate::github::ChangeInner {
523+
from: "fake-sha".to_string(),
524+
},
520525
}),
521526
});
522527
assert!(should_handle_event(&event));

0 commit comments

Comments
 (0)