Skip to content

Commit e65a683

Browse files
dannywillemsdannywillems
authored
Merge pull request #17963 from MinaProtocol/dkijania/merge/compatible_to_develop_251710
merge compatible to develop 251710
2 parents 8841934 + 167d1e0 commit e65a683

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1724
-942
lines changed

‎CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/CODEOWNERS @dannywillems @deepthiskumar @georgeee
22
/buildkite @MinaProtocol/infra-eng-reviewers
3-
/frontend/ @MinaProtocol/product-eng-reviewers
43
/dockerfiles/ @MinaProtocol/infra-eng-reviewers
54
/scripts/ @MinaProtocol/infra-eng-reviewers @MinaProtocol/protocol-eng-reviewers
65
/Makefile @MinaProtocol/infra-eng-reviewers

‎buildkite/scripts/archive/upgrade-script-check.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ main() {
137137
)
138138

139139
local scripts=(
140-
"src/app/archive/upgrade-to-mesa.sql"
141-
"src/app/archive/downgrade-to-berkeley.sql"
140+
"src/app/archive/upgrade_to_mesa.sql"
141+
"src/app/archive/downgrade_to_berkeley.sql"
142142
)
143143

144144
# Check if either monitored file has changes
@@ -202,4 +202,4 @@ main() {
202202
exit 0
203203
}
204204

205-
main "$@"
205+
main "$@"

‎buildkite/scripts/release/manager.sh‎

Lines changed: 343 additions & 268 deletions
Large diffs are not rendered by default.

‎buildkite/src/Command/DockerImage.dhall‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ let DockerPublish = ../Constants/DockerPublish.dhall
2828

2929
let VerifyDockers = ../Command/Packages/VerifyDockers.dhall
3030

31-
let Extensions = ../Lib/Extensions.dhall
32-
3331
let Arch = ../Constants/Arch.dhall
3432

3533
let ReleaseSpec =
@@ -120,26 +118,6 @@ let generateStep =
120118

121119
else " && ./scripts/debian/aptly.sh stop"
122120

123-
let suffix =
124-
Extensions.joinOptionals
125-
"-"
126-
[ merge
127-
{ Mainnet = None Text
128-
, Devnet = None Text
129-
, Dev = None Text
130-
, Lightnet = Some
131-
"${Profiles.toSuffixLowercase spec.deb_profile}"
132-
}
133-
spec.deb_profile
134-
, merge
135-
{ None = None Text
136-
, Instrumented = Some
137-
"${BuildFlags.toSuffixLowercase spec.build_flags}"
138-
}
139-
spec.build_flags
140-
, spec.deb_suffix
141-
]
142-
143121
let debSuffix =
144122
merge
145123
{ None = "", Some = \(s : Text) -> " --deb-suffix " ++ s }
@@ -158,8 +136,9 @@ let generateStep =
158136
, networks = [ spec.network ]
159137
, version = spec.deb_version
160138
, codenames = [ spec.deb_codename ]
161-
, suffix = suffix
162-
, arch = spec.arch
139+
, profile = spec.deb_profile
140+
, buildFlag = spec.build_flags
141+
, archs = [ spec.arch ]
163142
}
164143

165144
else ""

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

Lines changed: 63 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,18 @@ let publish
151151

152152
let indexedAdditionalTags = Prelude.List.indexed Text additional_tags
153153

154+
let architectures =
155+
join
156+
","
157+
( List/map
158+
Architecture.Type
159+
Text
160+
( \(architecture : Architecture.Type)
161+
-> Architecture.lowerName architecture
162+
)
163+
spec.architectures
164+
)
165+
154166
let signedArg =
155167
if DebianRepo.isSigned spec.debian_repo
156168

@@ -159,69 +171,60 @@ let publish
159171
else ""
160172

161173
let commands =
162-
List/map
163-
Architecture.Type
164-
(List Cmd.Type)
165-
( \(architecture : Architecture.Type)
166-
-> [ Cmd.runInDocker
167-
Cmd.Docker::{
168-
, image = ContainerImages.minaToolchain
169-
, extraEnv =
170-
[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY" ]
171-
, privileged = True
172-
, useRoot = True
173-
}
174-
( "git config --global --add safe.directory /workdir && "
175-
++ ". ./buildkite/scripts/export-git-env-vars.sh && "
176-
++ " gpg --import /var/secrets/debian/key.gpg && "
177-
++ " mkdir -p ./cache && "
178-
++ "DEBIAN_CACHE_FOLDER=/workdir/cache ./buildkite/scripts/release/manager.sh publish "
179-
++ "--artifacts ${artifacts} "
180-
++ "--networks ${networks} "
181-
++ "--buildkite-build-id ${spec.build_id} "
182-
++ "--backend ${spec.backend} "
183-
++ "--channel ${DebianChannel.lowerName
184-
spec.channel} "
185-
++ "--source-version ${spec.source_version} "
186-
++ "--target-version ${target_version} "
187-
++ "--codenames ${codenames} "
188-
++ "--debian-repo ${DebianRepo.bucket_or_default
189-
spec.debian_repo} "
190-
++ "--only-debians "
191-
++ "--arch ${Architecture.lowerName
192-
architecture} "
193-
++ "${keyArg}"
194-
)
195-
]
196-
# [ Cmd.run
197-
( ". ./buildkite/scripts/export-git-env-vars.sh && "
198-
++ "./buildkite/scripts/release/manager.sh verify "
199-
++ "--artifacts ${artifacts} "
200-
++ "--networks ${networks} "
201-
++ "--channel ${DebianChannel.lowerName
202-
spec.channel} "
203-
++ "--version ${target_version} "
204-
++ "--codenames ${codenames} "
205-
++ "--debian-repo ${DebianRepo.bucket_or_default
206-
spec.debian_repo} "
207-
++ "--only-debians "
208-
++ "--arch ${Architecture.lowerName
209-
architecture} "
210-
++ "${signedArg}"
211-
)
212-
]
213-
)
214-
spec.architectures
215-
216-
let flatCommands = Prelude.List.concat Cmd.Type commands
174+
[ Cmd.runInDocker
175+
Cmd.Docker::{
176+
, image = ContainerImages.minaToolchain
177+
, extraEnv =
178+
[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY" ]
179+
, privileged = True
180+
, useRoot = True
181+
}
182+
( "git config --global --add safe.directory /workdir && "
183+
++ ". ./buildkite/scripts/export-git-env-vars.sh && "
184+
++ " gpg --import /var/secrets/debian/key.gpg && "
185+
++ " mkdir -p ./cache && "
186+
++ "DEBIAN_CACHE_FOLDER=/workdir/cache ./buildkite/scripts/release/manager.sh publish "
187+
++ "--artifacts ${artifacts} "
188+
++ "--networks ${networks} "
189+
++ "--buildkite-build-id ${spec.build_id} "
190+
++ "--backend ${spec.backend} "
191+
++ "--channel ${DebianChannel.lowerName spec.channel} "
192+
++ "--source-version ${spec.source_version} "
193+
++ "--target-version ${target_version} "
194+
++ "--codenames ${codenames} "
195+
++ "--debian-repo ${DebianRepo.bucket_or_default
196+
spec.debian_repo} "
197+
++ "--only-debians "
198+
++ "--archs ${architectures} "
199+
++ "--profile ${Profiles.lowerName spec.profile} "
200+
++ "${keyArg}"
201+
)
202+
]
203+
# [ Cmd.run
204+
( ". ./buildkite/scripts/export-git-env-vars.sh && "
205+
++ "./buildkite/scripts/release/manager.sh verify "
206+
++ "--artifacts ${artifacts} "
207+
++ "--networks ${networks} "
208+
++ "--channel ${DebianChannel.lowerName spec.channel} "
209+
++ "--version ${target_version} "
210+
++ "--codenames ${codenames} "
211+
++ "--debian-repo ${DebianRepo.bucket_or_default
212+
spec.debian_repo} "
213+
++ "--profile ${Profiles.lowerName spec.profile} "
214+
++ "--only-debians "
215+
++ "--archs ${architectures} "
216+
++ "${signedArg}"
217+
)
218+
]
217219

218220
in [ Command.build
219221
Command.Config::{
220-
, commands = [ Mina.fixPermissionsCommand ] # flatCommands
222+
, commands = [ Mina.fixPermissionsCommand ] # commands
221223
, label = "Debian Packages Publishing"
222224
, key =
223225
"publish-debians-${DebianChannel.lowerName
224-
spec.channel}"
226+
spec.channel}-${Profiles.lowerName
227+
spec.profile}"
225228
, target = Size.Small
226229
, depends_on = spec.depends_on
227230
, if_ = spec.if_
@@ -254,8 +257,9 @@ let publish
254257
, label = "Docker Packages Publishing"
255258
, key =
256259
"publish-dockers-${DebianChannel.lowerName
257-
spec.channel}-${Natural/show
258-
r.index}"
260+
spec.channel}-${Profiles.lowerName
261+
spec.profile}-${Natural/show
262+
r.index}"
259263
, target = Size.Small
260264
, depends_on = spec.depends_on
261265
, if_ = spec.if_

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

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@ let DebianVersions = ../../Constants/DebianVersions.dhall
1616

1717
let Arch = ../../Constants/Arch.dhall
1818

19+
let BuildFlags = ../../Constants/BuildFlags.dhall
20+
21+
let Profiles = ../../Constants/Profiles.dhall
22+
1923
let Spec =
2024
{ Type =
2125
{ artifacts : List Artifact.Type
2226
, networks : List Network.Type
2327
, version : Text
2428
, codenames : List DebianVersions.DebVersion
2529
, published_to_docker_io : Bool
26-
, suffix : Optional Text
27-
, arch : Arch.Type
30+
, profile : Profiles.Type
31+
, archs : List Arch.Type
32+
, buildFlag : BuildFlags.Type
2833
}
2934
, default =
3035
{ artifacts = [] : List Package.Type
@@ -34,8 +39,9 @@ let Spec =
3439
, DebianVersions.DebVersion.Bullseye
3540
]
3641
, published_to_docker_io = False
37-
, suffix = None Text
38-
, arch = Arch.Type.Amd64
42+
, profile = Profiles.Type.Devnet
43+
, buildFlag = BuildFlags.Type.None
44+
, archs = [ Arch.Type.Amd64 ]
3945
}
4046
}
4147

@@ -69,41 +75,42 @@ let joinCodenames
6975
spec.codenames
7076
)
7177

78+
let joinArchitectures
79+
: Spec.Type -> Text
80+
= \(spec : Spec.Type)
81+
-> join
82+
","
83+
( Prelude.List.map
84+
Arch.Type
85+
Text
86+
(\(arch : Arch.Type) -> Arch.lowerName arch)
87+
spec.archs
88+
)
89+
7290
let verify
7391
: Spec.Type -> Text
7492
= \(spec : Spec.Type)
75-
-> let arch = Arch.toOptional spec.arch
76-
77-
let suffixAndArchFlag =
78-
let archFlag =
79-
Prelude.Optional.map
80-
Text
81-
Text
82-
(\(archValue : Text) -> "--arch ${archValue} ")
83-
arch
84-
85-
let suffixFlag =
86-
Prelude.Optional.map
87-
Text
88-
Text
89-
(\(suffix : Text) -> "--docker-suffix ${suffix} ")
90-
spec.suffix
91-
92-
in Prelude.Optional.default Text "" archFlag
93-
++ Prelude.Optional.default Text "" suffixFlag
93+
-> let archFlag = "--archs " ++ joinArchitectures spec ++ " "
94+
95+
let profileFlag = "--profile ${Profiles.lowerName spec.profile} "
96+
97+
let buildFlag =
98+
merge
99+
{ None = ""
100+
, Instrumented =
101+
"--build-flag ${BuildFlags.lowerName spec.buildFlag} "
102+
}
103+
spec.buildFlag
94104

95105
in ". ./buildkite/scripts/export-git-env-vars.sh && "
96106
++ "./buildkite/scripts/release/manager.sh verify "
97-
++ suffixAndArchFlag
98107
++ "--artifacts ${joinArtifacts spec} "
99108
++ "--networks ${joinNetworks spec} "
100109
++ "--version ${spec.version} "
101110
++ "--codenames ${joinCodenames spec} "
102-
++ merge
103-
{ None = ""
104-
, Some = \(suffix : Text) -> "--docker-suffix ${suffix} "
105-
}
106-
spec.suffix
111+
++ profileFlag
112+
++ archFlag
113+
++ buildFlag
107114
++ "--only-dockers "
108115

109116
in { verify = verify, Spec = Spec }

‎buildkite/src/Jobs/Lint/ArchiveUpgrade.dhall‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ in Pipeline.build
2020
, dirtyWhen =
2121
[ SelectFiles.exactly "src/app/archive/create_schema" "sql"
2222
, SelectFiles.exactly "src/app/archive/drop_tables" "sql"
23-
, SelectFiles.exactly "src/app/archive/upgrade-to-mesa" "sql"
24-
, SelectFiles.exactly "src/app/archive/downgrade-to-berkeley" "sql"
23+
, SelectFiles.exactly "src/app/archive/upgrade_to_mesa" "sql"
24+
, SelectFiles.exactly "src/app/archive/downgrade_to_berkeley" "sql"
2525
, SelectFiles.exactly "buildkite/src/Jobs/Lint/ArchiveUpgrade" "dhall"
2626
, SelectFiles.exactly
2727
"buildkite/scripts/archive/upgrade-script-check"

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

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@ let targetVersion =
5454
let specs_for_branch =
5555
\(branch : Text)
5656
-> \(channel : DebianChannel.Type)
57+
-> \(profile : Profiles.Type)
5758
-> PublishPackages.Spec::{
5859
, artifacts =
5960
[ Artifacts.Type.LogProc
6061
, Artifacts.Type.Daemon
6162
, Artifacts.Type.Archive
6263
, Artifacts.Type.Rosetta
6364
]
64-
, profile = Profiles.Type.Devnet
65+
, profile = profile
6566
, networks = [ Network.Type.Devnet ]
6667
, codenames =
6768
[ DebianVersions.DebVersion.Noble
@@ -91,9 +92,39 @@ in Pipeline.build
9192
}
9293
, steps =
9394
PublishPackages.publish
94-
(specs_for_branch "compatible" DebianChannel.Type.Compatible)
95+
( specs_for_branch
96+
"dkijania/add_missing_configurations"
97+
DebianChannel.Type.Compatible
98+
Profiles.Type.Lightnet
99+
)
100+
# PublishPackages.publish
101+
( specs_for_branch
102+
"develop"
103+
DebianChannel.Type.Develop
104+
Profiles.Type.Lightnet
105+
)
106+
# PublishPackages.publish
107+
( specs_for_branch
108+
"master"
109+
DebianChannel.Type.Master
110+
Profiles.Type.Lightnet
111+
)
112+
# PublishPackages.publish
113+
( specs_for_branch
114+
"dkijania/add_missing_configurations"
115+
DebianChannel.Type.Compatible
116+
Profiles.Type.Devnet
117+
)
95118
# PublishPackages.publish
96-
(specs_for_branch "develop" DebianChannel.Type.Develop)
119+
( specs_for_branch
120+
"develop"
121+
DebianChannel.Type.Develop
122+
Profiles.Type.Devnet
123+
)
97124
# PublishPackages.publish
98-
(specs_for_branch "master" DebianChannel.Type.Master)
125+
( specs_for_branch
126+
"master"
127+
DebianChannel.Type.Master
128+
Profiles.Type.Devnet
129+
)
99130
}

0 commit comments

Comments
 (0)