Merge pull request #17609 from MinaProtocol/dkijania/bump_dhall_to_1_42

dannywillems · web-flow · commit 7d8749292594 · 2025-10-09T11:53:23.000+02:00
make dhalls compliant with 1.41.1
diff --git a/buildkite/Makefile b/buildkite/Makefile
@@ -4,19 +4,26 @@ check_syntax:
 	# xargs will short-circuit if a command fails with code 255
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" &&  dhall --file {} > /dev/null || exit 255'
 
-check_lint:
-	@echo "Dhall version: $$(dhall --version)"
+convert_backticks_to_ifs:
+	sed -i -E 's/`if` =/if =/g' src/Command/Base.dhall
+
+convert_ifs_to_backticks:
+	sed -i -E 's/if =/`if` =/g' src/Command/Base.dhall
+
+check_lint: convert_backticks_to_ifs
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --ascii lint --check --inplace {} || exit 255'
 
-check_format:
+check_format: convert_backticks_to_ifs
 	@echo "Dhall version: $$(dhall --version)"
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{} format" && dhall --ascii format --check --inplace {} || exit 255'
 
 lint:
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --ascii lint --inplace {} || exit 255'
+	$(MAKE) convert_ifs_to_backticks
 
 format:
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --ascii format --inplace {} || exit 255'
+	$(MAKE) convert_ifs_to_backticks
 
 check_filter:
 	# Ensure Jobs.dhall is generated before proceeding
diff --git a/buildkite/src/Command/Base.dhall b/buildkite/src/Command/Base.dhall
@@ -102,7 +102,7 @@ let Config =
           , flake_retry_limit : Optional Natural
           , soft_fail : Optional B/SoftFail
           , skip : Optional B/Skip
-          , if : Optional B/If
+          , if_ : Optional B/If
           , timeout_in_minutes : Optional Integer
           }
       , default =
@@ -116,7 +116,7 @@ let Config =
           , flake_retry_limit = Some 0
           , soft_fail = None B/SoftFail
           , skip = None B/Skip
-          , if = None B/If
+          , if_ = None B/If
           , timeout_in_minutes = None Integer
           }
       }
@@ -244,7 +244,7 @@ let build
               }
           , soft_fail = c.soft_fail
           , skip = c.skip
-          , if = c.if
+          , `if` = c.if_
           , plugins =
               let dockerPart =
                     Optional/toList
diff --git a/buildkite/src/Command/DockerImage.dhall b/buildkite/src/Command/DockerImage.dhall
@@ -54,7 +54,7 @@ let ReleaseSpec =
           , step_key_suffix : Text
           , docker_publish : DockerPublish.Type
           , verify : Bool
-          , if : Optional B/If
+          , if_ : Optional B/If
           }
       , default =
           { deps = [] : List Command.TaggedKey.Type
@@ -77,7 +77,7 @@ let ReleaseSpec =
           , step_key_suffix = "-docker-image"
           , verify = False
           , deb_suffix = None Text
-          , if = None B/If
+          , if_ = None B/If
           }
       }
 
@@ -253,7 +253,7 @@ let generateStep =
                 , target = Size.XLarge
                 , docker_login = Some DockerLogin::{=}
                 , depends_on = spec.deps
-                , if = spec.if
+                , if_ = spec.if_
                 }
 
 in  { generateStep = generateStep
diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall
@@ -64,7 +64,7 @@ let MinaBuildSpec =
           , arch : Arch.Type
           , deb_legacy_version : Text
           , suffix : Optional Text
-          , if : Optional B/If
+          , if_ : Optional B/If
           }
       , default =
           { prefix = "MinaArtifact"
@@ -83,7 +83,7 @@ let MinaBuildSpec =
           , suffix = None Text
           , deb_legacy_version = "3.1.1-alpha1-compatible-14a8b92"
           , arch = Arch.Type.Amd64
-          , if = None B/If
+          , if_ = None B/If
           }
       }
 
@@ -140,7 +140,7 @@ let build_artifacts
             , label = "Debian: Build ${labelSuffix spec}"
             , key = "build-deb-pkg${Optional/default Text "" spec.suffix}"
             , target = Size.XLarge
-            , if = spec.if
+            , if_ = spec.if_
             , retries =
               [ Command.Retry::{
                 , exit_status = Command.ExitStatus.Code +2
@@ -183,7 +183,7 @@ let docker_step
                     , deb_legacy_version = spec.deb_legacy_version
                     , verify = True
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , DaemonAutoHardfork =
@@ -244,7 +244,7 @@ let docker_step
                     , deb_repo = DebianRepo.Type.Local
                     , deb_legacy_version = spec.deb_legacy_version
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , Archive =
@@ -260,7 +260,7 @@ let docker_step
                     , deb_legacy_version = spec.deb_legacy_version
                     , verify = True
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , Rosetta =
@@ -275,7 +275,7 @@ let docker_step
                     , deb_legacy_version = spec.deb_legacy_version
                     , verify = True
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , ZkappTestTransaction =
@@ -289,7 +289,7 @@ let docker_step
                     , deb_codename = spec.debVersion
                     , deb_legacy_version = spec.deb_legacy_version
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , FunctionalTestSuite =
@@ -304,7 +304,7 @@ let docker_step
                     , deb_profile = spec.profile
                     , deb_legacy_version = spec.deb_legacy_version
                     , arch = spec.arch
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                   ]
                 , Toolchain = [] : List DockerImage.ReleaseSpec.Type
diff --git a/buildkite/src/Command/Packages/Publish.dhall b/buildkite/src/Command/Packages/Publish.dhall
@@ -72,7 +72,7 @@ let Spec =
           , depends_on : List Command.TaggedKey.Type
           , branch : Text
           , architectures : List Architecture.Type
-          , if : Optional Text
+          , if_ : Optional Text
           }
       , default =
           { artifacts = [] : List Package.Type
@@ -89,7 +89,7 @@ let Spec =
           , verify = True
           , branch = ""
           , architectures = [ Architecture.Type.Amd64, Architecture.Type.Arm64 ]
-          , if = None Text
+          , if_ = None Text
           }
       }
 
@@ -224,7 +224,7 @@ let publish
                                              spec.channel}"
                     , target = Size.Small
                     , depends_on = spec.depends_on
-                    , if = spec.if
+                    , if_ = spec.if_
                     }
                 ]
               # Prelude.List.map
@@ -258,7 +258,7 @@ let publish
                                                                      r.index}"
                           , target = Size.Small
                           , depends_on = spec.depends_on
-                          , if = spec.if
+                          , if_ = spec.if_
                           }
                   )
                   indexedAdditionalTags
diff --git a/buildkite/src/Command/Rosetta/Connectivity.dhall b/buildkite/src/Command/Rosetta/Connectivity.dhall
@@ -37,7 +37,7 @@ let Spec =
           , timeout : Natural
           , profile : Profiles.Type
           , scope : List PipelineScope.Type
-          , if : B/If
+          , if_ : B/If
           }
       , default =
           { dockerType = Dockers.Type.Bullseye
@@ -47,7 +47,7 @@ let Spec =
           , timeout = 1000
           , profile = Profiles.Type.Devnet
           , scope = PipelineScope.Full
-          , if =
+          , if_ =
               "build.pull_request.base_branch != \"develop\" || build.branch == \"develop\""
           }
       }
@@ -73,7 +73,7 @@ let command
                 "rosetta-${Network.lowerName spec.network}-connectivity-test"
             , target = Size.XLarge
             , soft_fail = Some spec.softFail
-            , if = Some spec.if
+            , if_ = Some spec.if_
             , depends_on =
                 Dockers.dependsOn
                   Dockers.DepsSpec::{
diff --git a/buildkite/src/Jobs/Promote/AutoPromoteNightly.dhall b/buildkite/src/Jobs/Promote/AutoPromoteNightly.dhall
@@ -77,7 +77,7 @@ let specs_for_branch =
           , branch = "\\\${BUILDKITE_BRANCH}"
           , source_version = "\\\${MINA_DEB_VERSION}"
           , build_id = "\\\${BUILDKITE_BUILD_ID}"
-          , if = Some "build.branch == \"${branch}\""
+          , if_ = Some "build.branch == \"${branch}\""
           }
 
 in  Pipeline.build

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ let ReleaseSpec =`
`54`	`54`	`, step_key_suffix : Text`
`55`	`55`	`, docker_publish : DockerPublish.Type`
`56`	`56`	`, verify : Bool`
`57`		`- , if : Optional B/If`
	`57`	`+ , if_ : Optional B/If`
`58`	`58`	`}`
`59`	`59`	`, default =`
`60`	`60`	`{ deps = [] : List Command.TaggedKey.Type`
`@@ -77,7 +77,7 @@ let ReleaseSpec =`
`77`	`77`	`, step_key_suffix = "-docker-image"`
`78`	`78`	`, verify = False`
`79`	`79`	`, deb_suffix = None Text`
`80`		`- , if = None B/If`
	`80`	`+ , if_ = None B/If`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -253,7 +253,7 @@ let generateStep =`
`253`	`253`	`, target = Size.XLarge`
`254`	`254`	`, docker_login = Some DockerLogin::{=}`
`255`	`255`	`, depends_on = spec.deps`
`256`		`- , if = spec.if`
	`256`	`+ , if_ = spec.if_`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`in { generateStep = generateStep`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ let MinaBuildSpec =`
`64`	`64`	`, arch : Arch.Type`
`65`	`65`	`, deb_legacy_version : Text`
`66`	`66`	`, suffix : Optional Text`
`67`		`- , if : Optional B/If`
	`67`	`+ , if_ : Optional B/If`
`68`	`68`	`}`
`69`	`69`	`, default =`
`70`	`70`	`{ prefix = "MinaArtifact"`
`@@ -83,7 +83,7 @@ let MinaBuildSpec =`
`83`	`83`	`, suffix = None Text`
`84`	`84`	`, deb_legacy_version = "3.1.1-alpha1-compatible-14a8b92"`
`85`	`85`	`, arch = Arch.Type.Amd64`
`86`		`- , if = None B/If`
	`86`	`+ , if_ = None B/If`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -140,7 +140,7 @@ let build_artifacts`
`140`	`140`	`, label = "Debian: Build ${labelSuffix spec}"`
`141`	`141`	`, key = "build-deb-pkg${Optional/default Text "" spec.suffix}"`
`142`	`142`	`, target = Size.XLarge`
`143`		`- , if = spec.if`
	`143`	`+ , if_ = spec.if_`
`144`	`144`	`, retries =`
`145`	`145`	`[ Command.Retry::{`
`146`	`146`	`, exit_status = Command.ExitStatus.Code +2`
`@@ -183,7 +183,7 @@ let docker_step`
`183`	`183`	`, deb_legacy_version = spec.deb_legacy_version`
`184`	`184`	`, verify = True`
`185`	`185`	`, arch = spec.arch`
`186`		`- , if = spec.if`
	`186`	`+ , if_ = spec.if_`
`187`	`187`	`}`
`188`	`188`	`]`
`189`	`189`	`, DaemonAutoHardfork =`
`@@ -244,7 +244,7 @@ let docker_step`
`244`	`244`	`, deb_repo = DebianRepo.Type.Local`
`245`	`245`	`, deb_legacy_version = spec.deb_legacy_version`
`246`	`246`	`, arch = spec.arch`
`247`		`- , if = spec.if`
	`247`	`+ , if_ = spec.if_`
`248`	`248`	`}`
`249`	`249`	`]`
`250`	`250`	`, Archive =`
`@@ -260,7 +260,7 @@ let docker_step`
`260`	`260`	`, deb_legacy_version = spec.deb_legacy_version`
`261`	`261`	`, verify = True`
`262`	`262`	`, arch = spec.arch`
`263`		`- , if = spec.if`
	`263`	`+ , if_ = spec.if_`
`264`	`264`	`}`
`265`	`265`	`]`
`266`	`266`	`, Rosetta =`
`@@ -275,7 +275,7 @@ let docker_step`
`275`	`275`	`, deb_legacy_version = spec.deb_legacy_version`
`276`	`276`	`, verify = True`
`277`	`277`	`, arch = spec.arch`
`278`		`- , if = spec.if`
	`278`	`+ , if_ = spec.if_`
`279`	`279`	`}`
`280`	`280`	`]`
`281`	`281`	`, ZkappTestTransaction =`
`@@ -289,7 +289,7 @@ let docker_step`
`289`	`289`	`, deb_codename = spec.debVersion`
`290`	`290`	`, deb_legacy_version = spec.deb_legacy_version`
`291`	`291`	`, arch = spec.arch`
`292`		`- , if = spec.if`
	`292`	`+ , if_ = spec.if_`
`293`	`293`	`}`
`294`	`294`	`]`
`295`	`295`	`, FunctionalTestSuite =`
`@@ -304,7 +304,7 @@ let docker_step`
`304`	`304`	`, deb_profile = spec.profile`
`305`	`305`	`, deb_legacy_version = spec.deb_legacy_version`
`306`	`306`	`, arch = spec.arch`
`307`		`- , if = spec.if`
	`307`	`+ , if_ = spec.if_`
`308`	`308`	`}`
`309`	`309`	`]`
`310`	`310`	`, Toolchain = [] : List DockerImage.ReleaseSpec.Type`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ let Spec =`
`72`	`72`	`, depends_on : List Command.TaggedKey.Type`
`73`	`73`	`, branch : Text`
`74`	`74`	`, architectures : List Architecture.Type`
`75`		`- , if : Optional Text`
	`75`	`+ , if_ : Optional Text`
`76`	`76`	`}`
`77`	`77`	`, default =`
`78`	`78`	`{ artifacts = [] : List Package.Type`
`@@ -89,7 +89,7 @@ let Spec =`
`89`	`89`	`, verify = True`
`90`	`90`	`, branch = ""`
`91`	`91`	`, architectures = [ Architecture.Type.Amd64, Architecture.Type.Arm64 ]`
`92`		`- , if = None Text`
	`92`	`+ , if_ = None Text`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`@@ -224,7 +224,7 @@ let publish`
`224`	`224`	`spec.channel}"`
`225`	`225`	`, target = Size.Small`
`226`	`226`	`, depends_on = spec.depends_on`
`227`		`- , if = spec.if`
	`227`	`+ , if_ = spec.if_`
`228`	`228`	`}`
`229`	`229`	`]`
`230`	`230`	`# Prelude.List.map`
`@@ -258,7 +258,7 @@ let publish`
`258`	`258`	`r.index}"`
`259`	`259`	`, target = Size.Small`
`260`	`260`	`, depends_on = spec.depends_on`
`261`		`- , if = spec.if`
	`261`	`+ , if_ = spec.if_`
`262`	`262`	`}`
`263`	`263`	`)`
`264`	`264`	`indexedAdditionalTags`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ let specs_for_branch =`
`77`	`77`	`, branch = "\\\${BUILDKITE_BRANCH}"`
`78`	`78`	`, source_version = "\\\${MINA_DEB_VERSION}"`
`79`	`79`	`, build_id = "\\\${BUILDKITE_BUILD_ID}"`
`80`		`- , if = Some "build.branch == \"${branch}\""`
	`80`	`+ , if_ = Some "build.branch == \"${branch}\""`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`in Pipeline.build`