Skip to content

Commit 490528c

Browse files
dkijaniadkijania
authored
Merge branch 'compatible' into dkijania/fix_all_shellcheck_warnings
2 parents 6be0f9f + 9c65e1b commit 490528c

File tree

12 files changed

+404
-135
lines changed

12 files changed

+404
-135
lines changed

‎buildkite/scripts/release/manager.sh‎

Lines changed: 153 additions & 96 deletions
Large diffs are not rendered by default.

‎buildkite/src/Command/Bench/Base.dhall‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ let JobSpec = ../../Pipeline/JobSpec.dhall
1010

1111
let DebianVersions = ../../Constants/DebianVersions.dhall
1212

13+
let BuildFlags = ../../Constants/BuildFlags.dhall
14+
1315
let RunInToolchain = ../../Command/RunInToolchain.dhall
1416

1517
let Command = ../../Command/Base.dhall
@@ -44,7 +46,12 @@ let Spec =
4446
, default =
4547
{ mode = PipelineMode.Type.PullRequest
4648
, size = Size.Perf
47-
, dependsOn = DebianVersions.dependsOn DebianVersions.DepsSpec::{=}
49+
, dependsOn =
50+
DebianVersions.dependsOn
51+
DebianVersions.DepsSpec::{
52+
, build_flag = BuildFlags.Type.Instrumented
53+
}
54+
# DebianVersions.dependsOn DebianVersions.DepsSpec::{=}
4855
, additionalDirtyWhen = [] : List SelectFiles.Type
4956
, yellowThreshold = 0.1
5057
, redThreshold = 0.2

‎buildkite/src/Command/DockerImage.dhall‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ let Network = ../Constants/Network.dhall
2626

2727
let DockerPublish = ../Constants/DockerPublish.dhall
2828

29+
let VerifyDockers = ../Command/Packages/VerifyDockers.dhall
30+
31+
let Extensions = ../Lib/Extensions.dhall
32+
2933
let ReleaseSpec =
3034
{ Type =
3135
{ deps : List Command.TaggedKey.Type
@@ -45,6 +49,7 @@ let ReleaseSpec =
4549
, build_flags : BuildFlags.Type
4650
, step_key_suffix : Text
4751
, docker_publish : DockerPublish.Type
52+
, verify : Bool
4853
, if : Optional B/If
4954
}
5055
, default =
@@ -65,6 +70,7 @@ let ReleaseSpec =
6570
, no_cache = False
6671
, no_debian = False
6772
, step_key_suffix = "-docker-image"
73+
, verify = False
6874
, if = None B/If
6975
}
7076
}
@@ -105,6 +111,43 @@ let generateStep =
105111

106112
else " && ./scripts/debian/aptly.sh stop"
107113

114+
let suffix =
115+
Extensions.joinOptionals
116+
"-"
117+
[ merge
118+
{ Standard = None Text
119+
, Mainnet = None Text
120+
, Dev = None Text
121+
, Lightnet = Some
122+
"${Profiles.toSuffixLowercase spec.deb_profile}"
123+
}
124+
spec.deb_profile
125+
, merge
126+
{ None = None Text
127+
, Instrumented = Some
128+
"${BuildFlags.toSuffixLowercase spec.build_flags}"
129+
}
130+
spec.build_flags
131+
]
132+
133+
let maybeVerify =
134+
if spec.verify
135+
&& DockerPublish.shouldPublish
136+
spec.docker_publish
137+
spec.service
138+
139+
then " && "
140+
++ VerifyDockers.verify
141+
VerifyDockers.Spec::{
142+
, artifacts = [ spec.service ]
143+
, networks = [ spec.network ]
144+
, version = spec.deb_version
145+
, codenames = [ spec.deb_codename ]
146+
, suffix = suffix
147+
}
148+
149+
else ""
150+
108151
let buildDockerCmd =
109152
"./scripts/docker/build.sh"
110153
++ " --service ${Artifacts.dockerName spec.service}"
@@ -151,6 +194,7 @@ let generateStep =
151194
++ buildDockerCmd
152195
++ " && "
153196
++ releaseDockerCmd
197+
++ maybeVerify
154198
)
155199
]
156200

@@ -169,6 +213,7 @@ let generateStep =
169213
++ " && "
170214
++ releaseDockerCmd
171215
++ maybeStopDebianRepo
216+
++ maybeVerify
172217
)
173218
]
174219
}

‎buildkite/src/Command/MinaArtifact.dhall‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ let docker_step
163163
, docker_publish = docker_publish
164164
, deb_repo = DebianRepo.Type.Local
165165
, deb_legacy_version = spec.deb_legacy_version
166+
, verify = True
166167
, if = spec.if
167168
}
168169
]
@@ -213,6 +214,7 @@ let docker_step
213214
, docker_publish = docker_publish
214215
, deb_repo = DebianRepo.Type.Local
215216
, deb_legacy_version = spec.deb_legacy_version
217+
, verify = True
216218
, if = spec.if
217219
}
218220
]
@@ -226,6 +228,7 @@ let docker_step
226228
, docker_publish = docker_publish
227229
, deb_repo = DebianRepo.Type.Local
228230
, deb_legacy_version = spec.deb_legacy_version
231+
, verify = True
229232
, if = spec.if
230233
}
231234
]

‎buildkite/src/Command/PublishPackages.dhall‎ renamed to ‎buildkite/src/Command/Packages/Publish.dhall‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,40 @@
1-
let Prelude = ../External/Prelude.dhall
1+
let Prelude = ../../External/Prelude.dhall
22

3-
let Optional/map = Prelude.Optional.map
4-
5-
let Optional/default = Prelude.Optional.default
6-
7-
let List/drop = Prelude.List.drop
3+
let Extensions = ../../Lib/Extensions.dhall
84

9-
let List/concatMap = Prelude.List.concatMap
5+
let join = Extensions.join
106

11-
let Text/concat = Prelude.Text.concat
12-
13-
let Artifacts = ../Constants/Artifacts.dhall
14-
15-
let Size = ../Command/Size.dhall
7+
let Optional/map = Prelude.Optional.map
168

17-
let Package = ../Constants/DebianPackage.dhall
9+
let Optional/default = Prelude.Optional.default
1810

19-
let Network = ../Constants/Network.dhall
11+
let Artifacts = ../../Constants/Artifacts.dhall
2012

21-
let DebianChannel = ../Constants/DebianChannel.dhall
13+
let Size = ../../Command/Size.dhall
2214

23-
let Profiles = ../Constants/Profiles.dhall
15+
let Package = ../../Constants/DebianPackage.dhall
2416

25-
let Artifact = ../Constants/Artifacts.dhall
17+
let Network = ../../Constants/Network.dhall
2618

27-
let DebianVersions = ../Constants/DebianVersions.dhall
19+
let DebianChannel = ../../Constants/DebianChannel.dhall
2820

29-
let DebianRepo = ../Constants/DebianRepo.dhall
21+
let Profiles = ../../Constants/Profiles.dhall
3022

31-
let Toolchain = ../Constants/Toolchain.dhall
23+
let Artifact = ../../Constants/Artifacts.dhall
3224

33-
let ContainerImages = ../Constants/ContainerImages.dhall
25+
let DebianVersions = ../../Constants/DebianVersions.dhall
3426

35-
let Command = ./Base.dhall
27+
let DebianRepo = ../../Constants/DebianRepo.dhall
3628

37-
let Cmd = ../Lib/Cmds.dhall
29+
let Toolchain = ../../Constants/Toolchain.dhall
3830

39-
let Mina = ./Mina.dhall
31+
let ContainerImages = ../../Constants/ContainerImages.dhall
4032

41-
let join =
42-
\(sep : Text)
43-
-> \(xs : List Text)
44-
-> let concatWithSepAtStart =
45-
List/concatMap Text Text (\(item : Text) -> [ sep, item ]) xs
33+
let Command = ../Base.dhall
4634

47-
let concat = List/drop 1 Text concatWithSepAtStart
35+
let Cmd = ../../Lib/Cmds.dhall
4836

49-
in Text/concat concat
37+
let Mina = ../Mina.dhall
5038

5139
let Spec =
5240
{ Type =

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
let Prelude = ../../External/Prelude.dhall
2+
3+
let Extensions = ../../Lib/Extensions.dhall
4+
5+
let join = Extensions.join
6+
7+
let Artifacts = ../../Constants/Artifacts.dhall
8+
9+
let Package = ../../Constants/DebianPackage.dhall
10+
11+
let Network = ../../Constants/Network.dhall
12+
13+
let Artifact = ../../Constants/Artifacts.dhall
14+
15+
let DebianVersions = ../../Constants/DebianVersions.dhall
16+
17+
let Spec =
18+
{ Type =
19+
{ artifacts : List Artifact.Type
20+
, networks : List Network.Type
21+
, version : Text
22+
, codenames : List DebianVersions.DebVersion
23+
, published_to_docker_io : Bool
24+
, suffix : Optional Text
25+
}
26+
, default =
27+
{ artifacts = [] : List Package.Type
28+
, networks = [ Network.Type.Mainnet, Network.Type.Devnet ]
29+
, codenames =
30+
[ DebianVersions.DebVersion.Focal
31+
, DebianVersions.DebVersion.Bullseye
32+
]
33+
, published_to_docker_io = False
34+
, suffix = None Text
35+
}
36+
}
37+
38+
let joinArtifacts
39+
: Spec.Type -> Text
40+
= \(spec : Spec.Type) -> join "," (Artifacts.dockerNames spec.artifacts)
41+
42+
let joinNetworks
43+
: Spec.Type -> Text
44+
= \(spec : Spec.Type)
45+
-> join
46+
","
47+
( Prelude.List.map
48+
Network.Type
49+
Text
50+
(\(network : Network.Type) -> Network.lowerName network)
51+
spec.networks
52+
)
53+
54+
let joinCodenames
55+
: Spec.Type -> Text
56+
= \(spec : Spec.Type)
57+
-> join
58+
","
59+
( Prelude.List.map
60+
DebianVersions.DebVersion
61+
Text
62+
( \(debian : DebianVersions.DebVersion)
63+
-> DebianVersions.lowerName debian
64+
)
65+
spec.codenames
66+
)
67+
68+
let verify
69+
: Spec.Type -> Text
70+
= \(spec : Spec.Type)
71+
-> ". ./buildkite/scripts/export-git-env-vars.sh && "
72+
++ "./buildkite/scripts/release/manager.sh verify "
73+
++ "--artifacts ${joinArtifacts spec} "
74+
++ "--networks ${joinNetworks spec} "
75+
++ "--version ${spec.version} "
76+
++ "--codenames ${joinCodenames spec} "
77+
++ merge
78+
{ None = ""
79+
, Some = \(suffix : Text) -> "--docker-suffix ${suffix} "
80+
}
81+
spec.suffix
82+
++ "--only-dockers "
83+
84+
in { verify = verify, Spec = Spec }

‎buildkite/src/Entrypoints/PublishPackages.dhall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let S = ../Lib/SelectFiles.dhall
22

3-
let PublishPackages = ../Command/PublishPackages.dhall
3+
let PublishPackages = ../Command/Packages/Publish.dhall
44

55
let Profile = ../Constants/Profiles.dhall
66

‎buildkite/src/Jobs/Promote/AutoPromoteNightly.dhall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let PipelineTag = ../../Pipeline/Tag.dhall
2222

2323
let Pipeline = ../../Pipeline/Dsl.dhall
2424

25-
let PublishPackages = ../../Command/PublishPackages.dhall
25+
let PublishPackages = ../../Command/Packages/Publish.dhall
2626

2727
let new_tags =
2828
\(codename : DebianVersions.DebVersion)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ let RunInToolchain = ../../Command/RunInToolchain.dhall
1212

1313
let DebianVersions = ../../Constants/DebianVersions.dhall
1414

15+
let BuildFlags = ../../Constants/BuildFlags.dhall
16+
1517
let Profiles = ../../Constants/Profiles.dhall
1618

1719
let Docker = ../../Command/Docker/Type.dhall
@@ -21,7 +23,8 @@ let Size = ../../Command/Size.dhall
2123
let dependsOn =
2224
DebianVersions.dependsOn
2325
DebianVersions.DepsSpec::{ profile = Profiles.Type.Lightnet }
24-
# DebianVersions.dependsOn DebianVersions.DepsSpec::{=}
26+
# DebianVersions.dependsOn
27+
DebianVersions.DepsSpec::{ build_flag = BuildFlags.Type.Instrumented }
2528

2629
let buildTestCmd
2730
: Size -> Command.Type

‎buildkite/src/Lib/Extensions.dhall‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
-- This package provides utility functions which are not part of the
2+
-- standard Prelude, such as `join` for concatenating lists of text with a separator.
3+
4+
let Prelude = ../External/Prelude.dhall
5+
6+
let List/concatMap = Prelude.List.concatMap
7+
8+
let List/drop = Prelude.List.drop
9+
10+
let List/fold_ = Prelude.List.fold
11+
12+
let Text/concat = Prelude.Text.concat
13+
14+
let join =
15+
\(sep : Text)
16+
-> \(xs : List Text)
17+
-> let concatWithSepAtStart =
18+
List/concatMap Text Text (\(item : Text) -> [ sep, item ]) xs
19+
20+
let concat = List/drop 1 Text concatWithSepAtStart
21+
22+
in Text/concat concat
23+
24+
let joinOptionals
25+
: Text -> List (Optional Text) -> Optional Text
26+
= \(sep : Text)
27+
-> \(xs : List (Optional Text))
28+
-> List/fold_
29+
(Optional Text)
30+
xs
31+
(Optional Text)
32+
( \(acc : Optional Text)
33+
-> \(x : Optional Text)
34+
-> merge
35+
{ Some =
36+
\(text : Text)
37+
-> merge
38+
{ None = Some text
39+
, Some =
40+
\(accText : Text)
41+
-> Some (accText ++ sep ++ text)
42+
}
43+
acc
44+
, None = acc
45+
}
46+
x
47+
)
48+
(None Text)
49+
50+
in { join = join, joinOptionals = joinOptionals }

0 commit comments

Comments
 (0)