Skip to content

Commit f707592

Browse files
dkijaniadkijania
committed
select proper image for fixing permissions
1 parent 775dc3c commit f707592

File tree

5 files changed

+104
-11
lines changed

5 files changed

+104
-11
lines changed

‎buildkite/src/Command/Mina.dhall‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ let Base = ./Base.dhall
66

77
let Size = ./Size.dhall
88

9-
let dockerImage = (../Constants/ContainerImages.dhall).minaToolchain
10-
119
let fixPermissionsScript = "sudo chown -R opam ."
1210

1311
let Config =
14-
{ Type = { commands : List Cmd.Type, label : Text, key : Text }
12+
{ Type =
13+
{ commands : List Cmd.Type, label : Text, key : Text, image : Text }
1514
, default = {=}
1615
}
1716

@@ -24,11 +23,12 @@ let build
2423
, label = c.label
2524
, key = c.key
2625
, target = Size.Small
27-
, docker = Some Docker::{ image = dockerImage }
26+
, docker = Some Docker::{ image = c.image }
2827
}
2928

3029
in { fixPermissionsCommand =
31-
Cmd.runInDocker Cmd.Docker::{ image = dockerImage } fixPermissionsScript
30+
\(image : Text)
31+
-> Cmd.runInDocker Cmd.Docker::{ image = image } fixPermissionsScript
3232
, Config = Config
3333
, build = build
3434
, Type = Base.Type

‎buildkite/src/Command/Packages/Publish.dhall‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,11 @@ let publish
221221

222222
in [ Command.build
223223
Command.Config::{
224-
, commands = [ Mina.fixPermissionsCommand ] # commands
224+
, commands =
225+
[ Mina.fixPermissionsCommand
226+
ContainerImages.minaToolchain
227+
]
228+
# commands
225229
, label = "Debian Packages Publishing"
226230
, key =
227231
"publish-debians-${DebianChannel.lowerName

‎buildkite/src/Command/RunInToolchain.dhall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let runInToolchainImage
1212
-> \(platform : Text)
1313
-> \(environment : List Text)
1414
-> \(innerScript : Text)
15-
-> [ Mina.fixPermissionsCommand ]
15+
-> [ Mina.fixPermissionsCommand image ]
1616
# [ Cmd.runInDocker
1717
Cmd.Docker::{
1818
, image = image

‎buildkite/src/Jobs/Test/EmergencyHfTest.dhall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ in Pipeline.build
3737
[ Command.build
3838
Command.Config::{
3939
, commands =
40-
[ Mina.fixPermissionsCommand ]
40+
[ Mina.fixPermissionsCommand ContainerImages.minaToolchain ]
4141
# [ RunWithPostgres.runInDockerWithPostgresConn
4242
([] : List Text)
4343
(None RunWithPostgres.ScriptOrArchive)

‎buildkite/src/gen/Jobs.dhall‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,92 @@
1-
-- This file is autogenerated during builds. It remains checked in to ensure
2-
-- dhall configuration can still execute locally without running codegen.
3-
let Pipeline = ../Pipeline/Dsl.dhall in [] : List Pipeline.CompoundType
1+
[ -- Autogenerated do not edit by hand ,
2+
../../.././buildkite/src/Jobs/Lint/ArchiveUpgrade.dhall,
3+
../../.././buildkite/src/Jobs/Lint/Changelog.dhall,
4+
../../.././buildkite/src/Jobs/Lint/Docker.dhall,
5+
../../.././buildkite/src/Jobs/Lint/Rust.dhall,
6+
../../.././buildkite/src/Jobs/Lint/OCaml.dhall,
7+
../../.././buildkite/src/Jobs/Lint/Fast.dhall,
8+
../../.././buildkite/src/Jobs/Lint/Xrefcheck.dhall,
9+
../../.././buildkite/src/Jobs/Lint/Dhall.dhall,
10+
../../.././buildkite/src/Jobs/Lint/Merge.dhall,
11+
../../.././buildkite/src/Jobs/Lint/Bash.dhall,
12+
../../.././buildkite/src/Jobs/Bench/MinaBaseStable.dhall,
13+
../../.././buildkite/src/Jobs/Bench/SnarkProfilerUnstable.dhall,
14+
../../.././buildkite/src/Jobs/Bench/ZkappLimitsStable.dhall,
15+
../../.././buildkite/src/Jobs/Bench/SnarkProfilerStable.dhall,
16+
../../.././buildkite/src/Jobs/Bench/ZkappLimitsUnstable.dhall,
17+
../../.././buildkite/src/Jobs/Bench/LedgerExportUnstable.dhall,
18+
../../.././buildkite/src/Jobs/Bench/LedgerExportStable.dhall,
19+
../../.././buildkite/src/Jobs/Bench/HeapUsageUnstable.dhall,
20+
../../.././buildkite/src/Jobs/Bench/ArchiveStable.dhall,
21+
../../.././buildkite/src/Jobs/Bench/HeapUsageStable.dhall,
22+
../../.././buildkite/src/Jobs/Bench/MinaBaseUnstable.dhall,
23+
../../.././buildkite/src/Jobs/Bench/LedgerApplyStable.dhall,
24+
../../.././buildkite/src/Jobs/Bench/ArchiveUnstable.dhall,
25+
../../.././buildkite/src/Jobs/Bench/LedgerApplyUnstable.dhall,
26+
../../.././buildkite/src/Jobs/Test/ReplayerTest.dhall,
27+
../../.././buildkite/src/Jobs/Test/NixBuildTest.dhall,
28+
../../.././buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall,
29+
../../.././buildkite/src/Jobs/Test/ConnectToDevnet.dhall,
30+
../../.././buildkite/src/Jobs/Test/PatchArchiveTest.dhall,
31+
../../.././buildkite/src/Jobs/Test/ConnectToMainnet.dhall,
32+
../../.././buildkite/src/Jobs/Test/ZkappsExamplesTest.dhall,
33+
../../.././buildkite/src/Jobs/Test/RosettaMainnetConnect.dhall,
34+
../../.././buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall,
35+
../../.././buildkite/src/Jobs/Test/ZkappTestToolUnitTest.dhall,
36+
../../.././buildkite/src/Jobs/Test/ArchiveNodeTest.dhall,
37+
../../.././buildkite/src/Jobs/Test/RosettaUnitTest.dhall,
38+
../../.././buildkite/src/Jobs/Test/DaemonUnitTest.dhall,
39+
../../.././buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall,
40+
../../.././buildkite/src/Jobs/Test/EmergencyHfTest.dhall,
41+
../../.././buildkite/src/Jobs/Test/ArchiveNodeUnitTest.dhall,
42+
../../.././buildkite/src/Jobs/Test/SingleNodeTest.dhall,
43+
../../.././buildkite/src/Jobs/Test/Libp2pUnitTest.dhall,
44+
../../.././buildkite/src/Jobs/Test/HardForkTest.dhall,
45+
../../.././buildkite/src/Jobs/Test/RosettaDevnetConnect.dhall,
46+
../../.././buildkite/src/Jobs/Test/RocksDBLedgerTarCompatibilityTest.dhall,
47+
../../.././buildkite/src/Jobs/Test/ArchiveHardforkToolboxTest.dhall,
48+
../../.././buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall,
49+
../../.././buildkite/src/Jobs/Test/VersionLint.dhall,
50+
../../.././buildkite/src/Jobs/Promote/AutoPromoteNightly.dhall,
51+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleDevnetLightnet.dhall,
52+
../../.././buildkite/src/Jobs/Release/MinaArtifactOnlyDebianBullseyeBerkeleyDevnet.dhall,
53+
../../.././buildkite/src/Jobs/Release/MinaArtifactFocalMainnetMainnet.dhall,
54+
../../.././buildkite/src/Jobs/Release/MinaArtifactJammyMainnetMainnet.dhall,
55+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactNobleArm64.dhall,
56+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleMainnetMainnetArm64.dhall,
57+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeMainnetLegacyMainnet.dhall,
58+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleDevnetDevnetArm64.dhall,
59+
../../.././buildkite/src/Jobs/Release/MinaArtifactJammyDevnetLegacyDevnet.dhall,
60+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactNoble.dhall,
61+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormDevnetDevnetArm64.dhall,
62+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactBookworm.dhall,
63+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormDevnetLightnet.dhall,
64+
../../.././buildkite/src/Jobs/Release/MinaArtifactFocalMainnetLegacyMainnet.dhall,
65+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetDevnet.dhall,
66+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactBullseyeArm64.dhall,
67+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleMainnetMainnet.dhall,
68+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetLegacyDevnet.dhall,
69+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeMainnetMainnet.dhall,
70+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormDevnetLegacyDevnet.dhall,
71+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormDevnetDevnet.dhall,
72+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactBookwormArm64.dhall,
73+
../../.././buildkite/src/Jobs/Release/TraceTool.dhall,
74+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormMainnetMainnetArm64.dhall,
75+
../../.././buildkite/src/Jobs/Release/MinaArtifactJammyMainnetLegacyMainnet.dhall,
76+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleDevnetDevnet.dhall,
77+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeBerkeleyDevnet.dhall,
78+
../../.././buildkite/src/Jobs/Release/MinaArtifactFocalDevnetLegacyDevnet.dhall,
79+
../../.././buildkite/src/Jobs/Release/MinaArtifactFocalDevnetDevnet.dhall,
80+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactJammy.dhall,
81+
../../.././buildkite/src/Jobs/Release/MinaArtifactJammyDevnetDevnet.dhall,
82+
../../.././buildkite/src/Jobs/Release/MinaArtifactFocalBerkeleyDevnet.dhall,
83+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormDevnetLightnetArm64.dhall,
84+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleDevnetLegacyDevnet.dhall,
85+
../../.././buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall,
86+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeBerkeleyLightnet.dhall,
87+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormMainnetLegacyMainnet.dhall,
88+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleMainnetLegacyMainnet.dhall,
89+
../../.././buildkite/src/Jobs/Release/MinaArtifactNobleDevnetLightnetArm64.dhall,
90+
../../.././buildkite/src/Jobs/Release/MinaArtifactBullseyeBerkeleyDevnetInstrumented.dhall,
91+
../../.././buildkite/src/Jobs/Release/MinaArtifactBookwormMainnetMainnet.dhall,
92+
../../.././buildkite/src/Jobs/TearDown/Coverage.dhall ]

0 commit comments

Comments
 (0)