Skip to content

Commit 687bf44

Browse files
authored
Merge pull request #17780 from MinaProtocol/publisharm64
[CI] publish arm64 and amd64
2 parents 92e7ba9 + 0fcec3d commit 687bf44

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

buildkite/src/Command/Packages/Publish.dhall

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ let Optional/map = Prelude.Optional.map
88

99
let Optional/default = Prelude.Optional.default
1010

11+
let List/map = Prelude.List.map
12+
1113
let Artifacts = ../../Constants/Artifacts.dhall
1214

1315
let Size = ../../Command/Size.dhall
@@ -34,6 +36,8 @@ let Mina = ../Mina.dhall
3436

3537
let Artifact = ../../Constants/Artifacts.dhall
3638

39+
let Architecture = ../../Constants/Arch.dhall
40+
3741
let Spec =
3842
{ Type =
3943
{ artifacts : List Artifact.Type
@@ -67,6 +71,7 @@ let Spec =
6771
, publish_to_docker_io : Bool
6872
, depends_on : List Command.TaggedKey.Type
6973
, branch : Text
74+
, architectures : List Architecture.Type
7075
, if : Optional Text
7176
}
7277
, default =
@@ -83,6 +88,7 @@ let Spec =
8388
, publish_to_docker_io = False
8489
, verify = True
8590
, branch = ""
91+
, architectures = [ Architecture.Type.Amd64, Architecture.Type.Arm64 ]
8692
, if = None Text
8793
}
8894
}
@@ -152,11 +158,12 @@ let publish
152158

153159
else ""
154160

155-
in [ Command.build
156-
Command.Config::{
157-
, commands =
158-
[ Mina.fixPermissionsCommand ]
159-
# [ Cmd.runInDocker
161+
let commands =
162+
List/map
163+
Architecture.Type
164+
(List Cmd.Type)
165+
( \(architecture : Architecture.Type)
166+
-> [ Cmd.runInDocker
160167
Cmd.Docker::{
161168
, image = ContainerImages.minaToolchain
162169
, extraEnv =
@@ -181,6 +188,8 @@ let publish
181188
++ "--debian-repo ${DebianRepo.bucket_or_default
182189
spec.debian_repo} "
183190
++ "--only-debians "
191+
++ "--arch ${Architecture.lowerName
192+
architecture} "
184193
++ "${keyArg}"
185194
)
186195
]
@@ -196,9 +205,19 @@ let publish
196205
++ "--debian-repo ${DebianRepo.bucket_or_default
197206
spec.debian_repo} "
198207
++ "--only-debians "
208+
++ "--arch ${Architecture.lowerName
209+
architecture} "
199210
++ "${signedArg}"
200211
)
201212
]
213+
)
214+
spec.architectures
215+
216+
let flatCommands = Prelude.List.concat Cmd.Type commands
217+
218+
in [ Command.build
219+
Command.Config::{
220+
, commands = [ Mina.fixPermissionsCommand ] # flatCommands
202221
, label = "Debian Packages Publishing"
203222
, key =
204223
"publish-debians-${DebianChannel.lowerName

buildkite/src/Jobs/Promote/AutoPromoteNightly.dhall

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ let specs_for_branch =
6464
, profile = Profiles.Type.Devnet
6565
, networks = [ Network.Type.Devnet ]
6666
, codenames =
67-
[ DebianVersions.DebVersion.Bullseye
68-
, DebianVersions.DebVersion.Focal
69-
, DebianVersions.DebVersion.Noble
67+
[ DebianVersions.DebVersion.Noble
7068
, DebianVersions.DebVersion.Bookworm
7169
]
7270
, debian_repo = DebianRepo.Type.Nightly

0 commit comments

Comments
 (0)