Merge branch 'develop' into brian/ignore-peerlist-whitespace

MinaProtocol · Jun 12, 2024 · ab901fc · ab901fc
2 parents aca6ae0 + 8d45fa9
commit ab901fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/buildkite/src/Command/HardforkPackageGeneration.dhall b/buildkite/src/Command/HardforkPackageGeneration.dhall
@@ -23,6 +23,7 @@ let Size = ./Size.dhall
 let Libp2p = ./Libp2pHelperBuild.dhall
 let DockerImage = ./DockerImage.dhall
 let DebianVersions = ../Constants/DebianVersions.dhall
+let DebianRepo = ../Constants/DebianRepo.dhall
 let Profiles = ../Constants/Profiles.dhall
 let Artifacts = ../Constants/Artifacts.dhall
 let Toolchain = ../Constants/Toolchain.dhall
@@ -133,6 +134,7 @@ let pipeline : Spec.Type -> Pipeline.Config.Type =
             , network = network_name
             , deb_codename = "${DebianVersions.lowerName debVersion}"
             , deb_profile = profile
+            , deb_repo = DebianRepo.Type.Local
             , step_key = "daemon-berkeley-${DebianVersions.lowerName debVersion}${Profiles.toLabelSegment profile}-docker-image"
             }
         , Command.build Command.Config::{
@@ -171,6 +173,7 @@ let pipeline : Spec.Type -> Pipeline.Config.Type =
             , network = network_name
             , deb_codename = "${DebianVersions.lowerName debVersion}"
             , deb_profile = profile
+            , deb_repo = DebianRepo.Type.Local
             , step_key = "archive-${DebianVersions.lowerName debVersion}${Profiles.toLabelSegment profile}-docker-image"
             }
         , DockerImage.generateStep
@@ -182,6 +185,7 @@ let pipeline : Spec.Type -> Pipeline.Config.Type =
               ]
             , service = "mina-rosetta"
             , network = network_name
+            , deb_repo = DebianRepo.Type.Local
             , deb_codename = "${DebianVersions.lowerName debVersion}"
             , step_key = "rosetta-${DebianVersions.lowerName debVersion}${Profiles.toLabelSegment profile}-docker-image"
             }

diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall
@@ -46,12 +46,14 @@ let dependsOn = \(debVersion : DebVersion) -> \(profile : Profiles.Type) ->
 let minimalDirtyWhen = [
   S.exactly "buildkite/src/Constants/DebianVersions" "dhall",
   S.exactly "buildkite/src/Constants/ContainerImages" "dhall",
-  S.exactly "buildkite/src/Command/MinaArtifact" "sh",
+  S.exactly "buildkite/src/Command/HardforkPackageGeneration" "dhall",
+  S.exactly "buildkite/src/Command/MinaArtifact" "dhall",
   S.strictlyStart (S.contains "buildkite/src/Jobs/Release/MinaArtifact"),
   S.strictlyStart (S.contains "dockerfiles/stages"),
   S.exactly "scripts/rebuild-deb" "sh",
   S.exactly "scripts/release-docker" "sh",
   S.exactly "buildkite/scripts/build-artifact" "sh",
+  S.exactly "buildkite/scripts/build-hardfork-package" "sh",
   S.exactly "buildkite/scripts/check-compatibility" "sh",
   -- Snark profiler dirtyWhen
   S.exactly "buildkite/src/Jobs/Test/RunSnarkProfiler" "dhall",