Merge branch 'master' into prepare-release-1.3.2

danger · Nov 24, 2024 · f2ae8af · f2ae8af
2 parents 2253935 + a230d57
commit f2ae8af
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8
+FROM eclipse-temurin:23-jdk
 
 MAINTAINER Konstantin Aksenov
 

diff --git a/danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/gitlab/GitLab.kt b/danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/gitlab/GitLab.kt
@@ -73,6 +73,7 @@ data class GitLabMergeRequest(
     @SerialName("merge_when_pipeline_succeeds")
     val mergeOnPipelineSuccess: Boolean,
     val milestone: GitLabMilestone? = null,
+    @SerialName("head_pipeline")
     val pipeline: GitLabPipeline,
     @SerialName("project_id")
     val projectId: String,

diff --git a/danger-kotlin-library/src/test/resources/gitlabDangerJSON.json b/danger-kotlin-library/src/test/resources/gitlabDangerJSON.json
@@ -113,14 +113,14 @@
         "latest_build_started_at": "2021-04-30T14:35:00.103+02:00",
         "latest_build_finished_at": "2019-04-11T00:33:22.492Z",
         "first_deployed_to_production_at": "2019-04-11T00:30:22.492Z",
-        "pipeline": {
+        "pipeline": null,
+        "head_pipeline": {
           "id": 50,
           "sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",
           "ref": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
           "status": "success",
           "web_url": "https://gitlab.com/danger-systems/danger.systems/pipeline/621bc3348549e51c5bd6ea9f094913e9e4667c7b"
         },
-        "head_pipeline": null,
         "diff_refs": {
           "base_sha": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
           "head_sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",

diff --git a/danger-kotlin-library/src/test/resources/gitlabWithCancelledPipelineDangerJSON.json b/danger-kotlin-library/src/test/resources/gitlabWithCancelledPipelineDangerJSON.json
@@ -113,14 +113,14 @@
         "latest_build_started_at": "2021-04-30T14:35:00.103+02:00",
         "latest_build_finished_at": "2019-04-11T00:33:22.492Z",
         "first_deployed_to_production_at": "2019-04-11T00:30:22.492Z",
-        "pipeline": {
+        "pipeline": null,
+        "head_pipeline": {
           "id": 50,
           "sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",
           "ref": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
           "status": "canceled",
           "web_url": "https://gitlab.com/danger-systems/danger.systems/pipeline/621bc3348549e51c5bd6ea9f094913e9e4667c7b"
         },
-        "head_pipeline": null,
         "diff_refs": {
           "base_sha": "ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
           "head_sha": "621bc3348549e51c5bd6ea9f094913e9e4667c7b",