Skip to content

Commit 1d57d8b

Browse files
authored
Merge pull request #289 from grine4ka/change-using-gitlab-head-pipeline
Fix using `head_pipeline` instead of `pipeline` in GitLab
2 parents 197231e + f4dceda commit 1d57d8b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/gitlab/GitLab.kt

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ data class GitLabMergeRequest(
7373
@SerialName("merge_when_pipeline_succeeds")
7474
val mergeOnPipelineSuccess: Boolean,
7575
val milestone: GitLabMilestone? = null,
76+
@SerialName("head_pipeline")
7677
val pipeline: GitLabPipeline,
7778
@SerialName("project_id")
7879
val projectId: String,

danger-kotlin-library/src/test/resources/gitlabDangerJSON.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@
113113
"latest_build_started_at": "2021-04-30T14:35:00.103+02:00",
114114
"latest_build_finished_at": "2019-04-11T00:33:22.492Z",
115115
"first_deployed_to_production_at": "2019-04-11T00:30:22.492Z",
116-
"pipeline": {
116+
"pipeline": null,
117+
"head_pipeline": {
117118
"id": 50,
118119
"sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",
119120
"ref": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
120121
"status": "success",
121122
"web_url": "https://gitlab.com/danger-systems/danger.systems/pipeline/621bc3348549e51c5bd6ea9f094913e9e4667c7b"
122123
},
123-
"head_pipeline": null,
124124
"diff_refs": {
125125
"base_sha": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
126126
"head_sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",

danger-kotlin-library/src/test/resources/gitlabWithCancelledPipelineDangerJSON.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@
113113
"latest_build_started_at": "2021-04-30T14:35:00.103+02:00",
114114
"latest_build_finished_at": "2019-04-11T00:33:22.492Z",
115115
"first_deployed_to_production_at": "2019-04-11T00:30:22.492Z",
116-
"pipeline": {
116+
"pipeline": null,
117+
"head_pipeline": {
117118
"id": 50,
118119
"sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",
119120
"ref": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
120121
"status": "canceled",
121122
"web_url": "https://gitlab.com/danger-systems/danger.systems/pipeline/621bc3348549e51c5bd6ea9f094913e9e4667c7b"
122123
},
123-
"head_pipeline": null,
124124
"diff_refs": {
125125
"base_sha": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
126126
"head_sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",

0 commit comments

Comments
 (0)