Skip to content

Commit 90a6f48

Browse files
committed
reuse new fix permission command
1 parent 3e84dcf commit 90a6f48

File tree

4 files changed

+20
-31
lines changed

4 files changed

+20
-31
lines changed

buildkite/src/Command/Packages/Publish.dhall

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let Command = ../Base.dhall
3434

3535
let Cmd = ../../Lib/Cmds.dhall
3636

37-
let Mina = ../Mina.dhall
37+
let FixPermissions = ../FixPermissions.dhall
3838

3939
let Artifact = ../../Constants/Artifacts.dhall
4040

@@ -221,7 +221,9 @@ let publish
221221

222222
in [ Command.build
223223
Command.Config::{
224-
, commands = [ Mina.fixPermissionsCommand ] # commands
224+
, commands =
225+
[ FixPermissions.command Architecture.Type.Amd64 ]
226+
# commands
225227
, label = "Debian Packages Publishing"
226228
, key =
227229
"publish-debians-${DebianChannel.lowerName

buildkite/src/Command/RunInToolchain.dhall

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
let Cmd = ../Lib/Cmds.dhall
22

3-
let Mina = ../Command/Mina.dhall
4-
53
let ContainerImages = ../Constants/ContainerImages.dhall
64

75
let Arch = ../Constants/Arch.dhall
86

7+
let FixPermissions = ../Command/FixPermissions.dhall
8+
99
let runInToolchainImage
10-
: Text -> Text -> List Text -> Text -> List Cmd.Type
10+
: Text -> Arch.Type -> List Text -> Text -> List Cmd.Type
1111
= \(image : Text)
12-
-> \(platform : Text)
12+
-> \(arch : Arch.Type)
1313
-> \(environment : List Text)
1414
-> \(innerScript : Text)
15-
-> [ Mina.fixPermissionsCommand ]
15+
-> [ FixPermissions.command arch ]
1616
# [ Cmd.runInDocker
1717
Cmd.Docker::{
1818
, image = image
1919
, extraEnv = environment
20-
, platform = platform
20+
, platform = Arch.platform arch
2121
}
2222
innerScript
2323
]
@@ -34,19 +34,15 @@ let runInToolchainNoble
3434
}
3535
arch
3636

37-
in runInToolchainImage
38-
image
39-
(Arch.platform arch)
40-
environment
41-
innerScript
37+
in runInToolchainImage image arch environment innerScript
4238

4339
let runInToolchainJammy
4440
: List Text -> Text -> List Cmd.Type
4541
= \(environment : List Text)
4642
-> \(innerScript : Text)
4743
-> runInToolchainImage
4844
ContainerImages.minaToolchainJammy.amd64
49-
(Arch.platform Arch.Type.Amd64)
45+
Arch.Type.Amd64
5046
environment
5147
innerScript
5248

@@ -62,11 +58,7 @@ let runInToolchainBookworm
6258
}
6359
arch
6460

65-
in runInToolchainImage
66-
image
67-
(Arch.platform arch)
68-
environment
69-
innerScript
61+
in runInToolchainImage image arch environment innerScript
7062

7163
let runInToolchainBullseye
7264
: Arch.Type -> List Text -> Text -> List Cmd.Type
@@ -80,19 +72,15 @@ let runInToolchainBullseye
8072
}
8173
arch
8274

83-
in runInToolchainImage
84-
image
85-
(Arch.platform arch)
86-
environment
87-
innerScript
75+
in runInToolchainImage image arch environment innerScript
8876

8977
let runInToolchain
9078
: List Text -> Text -> List Cmd.Type
9179
= \(environment : List Text)
9280
-> \(innerScript : Text)
9381
-> runInToolchainImage
9482
ContainerImages.minaToolchain
95-
(Arch.platform Arch.Type.Amd64)
83+
Arch.Type.Amd64
9684
environment
9785
innerScript
9886

buildkite/src/Constants/Toolchain.dhall

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ let select =
2727
-> merge
2828
{ ByDebianAndArch = runner debVersion arch
2929
, Custom =
30-
\(image : Text)
31-
-> RunInToolchain.runInToolchainImage
32-
image
33-
(Arch.platform arch)
30+
\(image : Text) -> RunInToolchain.runInToolchainImage image arch
3431
}
3532
mode
3633

buildkite/src/Jobs/Test/EmergencyHfTest.dhall

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ let RunWithPostgres = ../../Command/RunWithPostgres.dhall
1414

1515
let ContainerImages = ../../Constants/ContainerImages.dhall
1616

17-
let Mina = ../../Command/Mina.dhall
17+
let FixPermissions = ../../Command/FixPermissions.dhall
18+
19+
let Arch = ../../Constants/Arch.dhall
1820

1921
let key = "emergency-hf-test"
2022

@@ -37,7 +39,7 @@ in Pipeline.build
3739
[ Command.build
3840
Command.Config::{
3941
, commands =
40-
[ Mina.fixPermissionsCommand ]
42+
[ FixPermissions.command Arch.Type.Amd64 ]
4143
# [ RunWithPostgres.runInDockerWithPostgresConn
4244
([] : List Text)
4345
(None RunWithPostgres.ScriptOrArchive)

0 commit comments

Comments
 (0)