Skip to content

Commit 6e0eed5

Browse files
dkijaniadkijania
authored
Merge pull request #18015 from MinaProtocol/lyh/compat-into-dev-oct28
Merge compatible into develop Oct. 28th
2 parents 8ac20ff + 3ee406d commit 6e0eed5

File tree

59 files changed

+1057
-853
lines changed

Some content is hidden

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

59 files changed

+1057
-853
lines changed

‎buildkite/scripts/release/manager.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,19 @@ function get_suffix() {
145145

146146
case $__profile in
147147
lightnet)
148-
echo "-lightnet"
148+
__profile_part="-lightnet"
149149
;;
150150
instrumented)
151-
echo "-instrumented"
151+
__profile_part="-instrumented"
152152
;;
153-
154153
*)
155-
echo ""
154+
__profile_part=""
156155
;;
157156
esac
158157

159158
case $__artifact in
160159
mina-daemon)
161-
echo "-$__network$__profile"
160+
echo "-$__network$__profile_part"
162161
;;
163162
mina-rosetta)
164163
echo "-$__network"
@@ -256,9 +255,10 @@ function calculate_docker_tag() {
256255
local __target_version=$3
257256
local __codename=$4
258257
local __network=$5
258+
local __profile=$6
259259

260260
local __network_suffix
261-
__network_suffix=$(get_suffix $__artifact $__network)
261+
__network_suffix=$(get_suffix $__artifact $__network "$__profile")
262262

263263
local __arch_suffix
264264
__arch_suffix=$(get_arch_suffix $__arch)
@@ -518,7 +518,7 @@ function promote_and_verify_docker() {
518518
fi
519519

520520
echo " 🐋 Publishing $__artifact docker for '$__network' network and '$__codename' codename with '$__target_version' version and '$__arch' "
521-
echo " 📦 Target version: $(calculate_docker_tag $__publish_to_docker_io $__artifact $__target_version $__codename "$__network ")"
521+
echo " 📦 Target version: $(calculate_docker_tag $__publish_to_docker_io $__artifact $__target_version $__codename $__network $__profile )"
522522
echo ""
523523
if [[ $__dry_run == 0 ]]; then
524524
prefix_cmd "$SUBCOMMAND_TAB" $SCRIPTPATH/../../../scripts/docker/promote.sh \
@@ -1202,7 +1202,7 @@ function promote(){
12021202
fi
12031203

12041204
if [[ $__only_debians == 0 ]]; then
1205-
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__publish_to_docker_io $__verify $__arch $__dry_run
1205+
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__profile $__publish_to_docker_io $__verify $__arch $__dry_run
12061206
fi
12071207
done
12081208
;;
@@ -1225,7 +1225,7 @@ function promote(){
12251225
fi
12261226

12271227
if [[ $__only_debians == 0 ]]; then
1228-
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__publish_to_docker_io $__verify $__arch $__dry_run
1228+
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__profile $__publish_to_docker_io $__verify $__arch $__dry_run
12291229
fi
12301230
done
12311231
;;
@@ -1247,7 +1247,7 @@ function promote(){
12471247
fi
12481248

12491249
if [[ $__only_debians == 0 ]]; then
1250-
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__publish_to_docker_io $__verify $__arch $__dry_run
1250+
promote_and_verify_docker $artifact $__source_version $__target_version $__codename $network $__profile $__publish_to_docker_io $__verify $__arch $__dry_run
12511251
fi
12521252
done
12531253
;;

‎buildkite/src/Command/ArchiveNodeTest.dhall‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ in { step =
1919
[ "ARCHIVE_TEST_APP=mina-archive-node-test"
2020
, "MINA_TEST_NETWORK_DATA=/etc/mina/test/archive/sample_db"
2121
]
22-
"src/test/archive/sample_db/archive_db.sql"
22+
( RunWithPostgres.ScriptOrArchive.Script
23+
"src/test/archive/sample_db/archive_db.sql"
24+
)
2325
( Artifacts.fullDockerTag
2426
Artifacts.Tag::{
2527
, artifact = Artifacts.Type.FunctionalTestSuite

‎buildkite/src/Command/MinaArtifact.dhall‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ let build_artifacts
113113
-> Command.build
114114
Command.Config::{
115115
, commands =
116-
Toolchain.select
116+
[ Cmd.run "./scripts/docker/setup_buildx.sh" ]
117+
# Toolchain.select
117118
spec.toolchainSelectMode
118119
spec.debVersion
119120
spec.arch
@@ -139,7 +140,8 @@ let build_artifacts
139140
]
140141
, label = "Debian: Build ${labelSuffix spec}"
141142
, key = "build-deb-pkg${Optional/default Text "" spec.suffix}"
142-
, target = Size.Multi
143+
, target =
144+
merge { Amd64 = Size.Multi, Arm64 = Size.XLarge } spec.arch
143145
, if_ = spec.if_
144146
, retries =
145147
[ Command.Retry::{

‎buildkite/src/Command/PatchArchiveTest.dhall‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ in { step =
1919
[ "PATCH_ARCHIVE_TEST_APP=mina-patch-archive-test"
2020
, "NETWORK_DATA_FOLDER=/etc/mina/test/archive/sample_db"
2121
]
22-
"./src/test/archive/sample_db/archive_db.sql"
22+
( RunWithPostgres.ScriptOrArchive.Script
23+
"./src/test/archive/sample_db/archive_db.sql"
24+
)
2325
( Artifacts.fullDockerTag
2426
Artifacts.Tag::{
2527
, artifact = Artifacts.Type.FunctionalTestSuite

‎buildkite/src/Command/ReplayerTest.dhall‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ in { step =
1717
, commands =
1818
[ RunWithPostgres.runInDockerWithPostgresConn
1919
([] : List Text)
20-
"./src/test/archive/sample_db/archive_db.sql"
20+
( RunWithPostgres.ScriptOrArchive.Script
21+
"./src/test/archive/sample_db/archive_db.sql"
22+
)
2123
( Artifacts.fullDockerTag
2224
Artifacts.Tag::{
2325
, artifact = Artifacts.Type.FunctionalTestSuite

‎buildkite/src/Command/RunInToolchain.dhall‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,18 @@ let ContainerImages = ../Constants/ContainerImages.dhall
77
let Arch = ../Constants/Arch.dhall
88

99
let runInToolchainImage
10-
: Text -> List Text -> Text -> List Cmd.Type
10+
: Text -> Text -> List Text -> Text -> List Cmd.Type
1111
= \(image : Text)
12+
-> \(platform : Text)
1213
-> \(environment : List Text)
1314
-> \(innerScript : Text)
1415
-> [ Mina.fixPermissionsCommand ]
1516
# [ Cmd.runInDocker
16-
Cmd.Docker::{ image = image, extraEnv = environment }
17+
Cmd.Docker::{
18+
, image = image
19+
, extraEnv = environment
20+
, platform = platform
21+
}
1722
innerScript
1823
]
1924

@@ -29,14 +34,19 @@ let runInToolchainNoble
2934
}
3035
arch
3136

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

3443
let runInToolchainJammy
3544
: List Text -> Text -> List Cmd.Type
3645
= \(environment : List Text)
3746
-> \(innerScript : Text)
3847
-> runInToolchainImage
3948
ContainerImages.minaToolchainJammy.amd64
49+
(Arch.platform Arch.Type.Amd64)
4050
environment
4151
innerScript
4252

@@ -52,7 +62,11 @@ let runInToolchainBookworm
5262
}
5363
arch
5464

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

5771
let runInToolchainBullseye
5872
: Arch.Type -> List Text -> Text -> List Cmd.Type
@@ -61,6 +75,7 @@ let runInToolchainBullseye
6175
-> \(innerScript : Text)
6276
-> runInToolchainImage
6377
ContainerImages.minaToolchainBullseye.amd64
78+
(Arch.platform arch)
6479
environment
6580
innerScript
6681

@@ -70,6 +85,7 @@ let runInToolchain
7085
-> \(innerScript : Text)
7186
-> runInToolchainImage
7287
ContainerImages.minaToolchain
88+
(Arch.platform Arch.Type.Amd64)
7389
environment
7490
innerScript
7591

‎buildkite/src/Command/RunWithPostgres.dhall‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ let Cmd = ../Lib/Cmds.dhall
5757

5858
let ContainerImages = ../Constants/ContainerImages.dhall
5959

60+
let ScriptOrArchive
61+
: Type
62+
= < Script : Text | Archive : { Script : Text, Archive : Text } >
63+
6064
let runInDockerWithPostgresConn
61-
: List Text -> Text -> Text -> Text -> Cmd.Type
65+
: List Text -> ScriptOrArchive -> Text -> Text -> Cmd.Type
6266
= \(environment : List Text)
63-
-> \(initScript : Text)
67+
-> \(initScript : ScriptOrArchive)
6468
-> \(docker : Text)
6569
-> \(innerScript : Text)
6670
-> let port = "5432"
@@ -97,13 +101,31 @@ let runInDockerWithPostgresConn
97101
: Text
98102
= "\\\$BUILDKITE_BUILD_CHECKOUT_PATH"
99103

104+
let runInitScript =
105+
merge
106+
{ Script =
107+
\(script : Text)
108+
-> [ "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${script}"
109+
]
110+
, Archive =
111+
\(archive : { Script : Text, Archive : Text })
112+
-> [ "tar -xzf ${archive.Archive}"
113+
, "docker exec ${postgresDockerName} find /workdir -name \"${archive.Script}\" -exec psql ${pg_conn} -f {} \\;"
114+
]
115+
}
116+
initScript
117+
100118
in Cmd.chain
101-
[ "( docker stop ${postgresDockerName} && docker rm ${postgresDockerName} ) || true"
102-
, "source buildkite/scripts/export-git-env-vars.sh"
103-
, "docker run --network host --volume ${outerDir}:/workdir --workdir /workdir --name ${postgresDockerName} -d -e POSTGRES_USER=${user} -e POSTGRES_PASSWORD=${password} -e POSTGRES_PASSWORD=${password} -e POSTGRES_DB=${dbName} ${dockerVersion}"
104-
, "sleep 5"
105-
, "docker exec ${postgresDockerName} psql ${pg_conn} -f /workdir/${initScript}"
106-
, "docker run --pid=container:postgres --network host --volume ${outerDir}:/workdir --workdir /workdir --entrypoint bash ${envVars} ${docker} ${innerScript}"
107-
]
108-
109-
in { runInDockerWithPostgresConn = runInDockerWithPostgresConn }
119+
( [ "( docker stop ${postgresDockerName} && docker rm ${postgresDockerName} ) || true"
120+
, "source buildkite/scripts/export-git-env-vars.sh"
121+
, "docker run --network host --volume ${outerDir}:/workdir --workdir /workdir --name ${postgresDockerName} -d -e POSTGRES_USER=${user} -e POSTGRES_PASSWORD=${password} -e POSTGRES_DB=${dbName} ${dockerVersion}"
122+
, "sleep 5"
123+
]
124+
# runInitScript
125+
# [ "docker run --pid=container:postgres --network host --volume ${outerDir}:/workdir --workdir /workdir --entrypoint bash ${envVars} ${docker} ${innerScript}"
126+
]
127+
)
128+
129+
in { runInDockerWithPostgresConn = runInDockerWithPostgresConn
130+
, ScriptOrArchive = ScriptOrArchive
131+
}

‎buildkite/src/Constants/ContainerImages.dhall‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
66
, minaToolchainBookworm =
77
{ amd64 =
8-
"gcr.io/o1labs-192920/mina-toolchain@sha256:a3517722b1573ac19f9361d42aa0b5f15a108d62fa73f97f0a74e195af1a2e90"
8+
"gcr.io/o1labs-192920/mina-toolchain@sha256:af79d53279cd58d8c3b013e8c438b479d9067bcdbe8cb32ced74a156bba78e15"
99
, arm64 =
10-
"gcr.io/o1labs-192920/mina-toolchain@sha256:b4a7040b64473f89e51372ab6e11f9332730e085766aa157c25e28c6b9c0c6d4"
10+
"gcr.io/o1labs-192920/mina-toolchain@sha256:a073bd8a471d03216bc1080ef3fda7a414bac786e6b18021241983194f118624"
1111
}
1212
, minaToolchainBullseye.amd64 =
13-
"gcr.io/o1labs-192920/mina-toolchain@sha256:524a3fb77d6702f38ad63ec737e398478e082387753b8d01e1ccf607d2917343"
13+
"gcr.io/o1labs-192920/mina-toolchain@sha256:24c1a641f0d55167006581fd70a013cd90f8a89f3424650ace7ba4210b6825b6"
1414
, minaToolchainNoble =
1515
{ amd64 =
16-
"gcr.io/o1labs-192920/mina-toolchain@sha256:3fd6ebfedb905ba358903639c2ebcdbd2277316b854d80f12c74df8dcd83734b"
16+
"gcr.io/o1labs-192920/mina-toolchain@sha256:37c475d7bcb412fa210e7f3cc82e48e2b78de7a5d770bee7a38cc35577890efc"
1717
, arm64 =
18-
"gcr.io/o1labs-192920/mina-toolchain@sha256:adfff17bf21b79efc3b2d54d0648049a36fa7b54b732773bd7f2f651869c1f54"
18+
"gcr.io/o1labs-192920/mina-toolchain@sha256:b5ed1feaf22bf72a68db0b9289f578fee511474412a36891e97afb5f5c2a8bd5"
1919
}
2020
, minaToolchainJammy.amd64 =
21-
"gcr.io/o1labs-192920/mina-toolchain@sha256:6db30a6faf94f7dcc23a14bcbc01d558b2164955067fd21eb92a981fe231dfe1"
21+
"gcr.io/o1labs-192920/mina-toolchain@sha256:ff7224ded94d4b41049c1c2f5b3df0820cf81d435291b116628a6c582e9c5c2b"
2222
, minaToolchain =
23-
"gcr.io/o1labs-192920/mina-toolchain@sha256:524a3fb77d6702f38ad63ec737e398478e082387753b8d01e1ccf607d2917343"
23+
"gcr.io/o1labs-192920/mina-toolchain@sha256:24c1a641f0d55167006581fd70a013cd90f8a89f3424650ace7ba4210b6825b6"
2424
, postgres = "postgres:12.4-alpine"
2525
, xrefcheck =
2626
"dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

‎buildkite/src/Constants/Toolchain.dhall‎

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

‎buildkite/src/Jobs/Bench/HeapUsageStable.dhall‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)