Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "src/lib/snarky"]
path = src/lib/snarky
url = https://github.com/o1-labs/snarky
url = https://github.com/glyh/snarky
[submodule "src/lib/crypto/proof-systems"]
path = src/lib/crypto/proof-systems
url = https://github.com/o1-labs/proof-systems.git
Expand Down
13 changes: 5 additions & 8 deletions buildkite/src/Constants/DebianVersions.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let BuildFlags = ./BuildFlags.dhall

let S = ../Lib/SelectFiles.dhall

let DebVersion = < Bookworm | Bullseye | Jammy | Focal >
let DebVersion = < Bookworm | Bullseye | Jammy | Focal | Noble >

let capitalName =
\(debVersion : DebVersion)
Expand All @@ -19,6 +19,7 @@ let capitalName =
, Bullseye = "Bullseye"
, Jammy = "Jammy"
, Focal = "Focal"
, Noble = "Noble"
}
debVersion

Expand All @@ -29,6 +30,7 @@ let lowerName =
, Bullseye = "bullseye"
, Jammy = "jammy"
, Focal = "focal"
, Noble = "noble"
}
debVersion

Expand All @@ -49,13 +51,7 @@ let dependsOnStep =
network}${profileSuffix}${BuildFlags.toSuffixUppercase
buildFlag}"

in merge
{ Bookworm = [ { name = name, key = "${step}-deb-pkg" } ]
, Bullseye = [ { name = name, key = "${step}-deb-pkg" } ]
, Jammy = [ { name = name, key = "${step}-deb-pkg" } ]
, Focal = [ { name = name, key = "${step}-deb-pkg" } ]
}
debVersion
in [ { name = name, key = "${step}-deb-pkg" } ]

let dependsOn =
\(debVersion : DebVersion)
Expand Down Expand Up @@ -113,6 +109,7 @@ let dirtyWhen =
, Bullseye = bullseyeDirtyWhen
, Jammy = minimalDirtyWhen
, Focal = minimalDirtyWhen
, Noble = minimalDirtyWhen
}
debVersion

Expand Down
40 changes: 7 additions & 33 deletions buildkite/src/Constants/DockerVersions.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let Network = ./Network.dhall

let Docker
: Type
= < Bookworm | Bullseye | Jammy | Focal >
= < Bookworm | Bullseye | Jammy | Focal | Noble >

let capitalName =
\(docker : Docker)
Expand All @@ -15,6 +15,7 @@ let capitalName =
, Bullseye = "Bullseye"
, Jammy = "Jammy"
, Focal = "Focal"
, Noble = "Noble"
}
docker

Expand All @@ -25,6 +26,7 @@ let lowerName =
, Bullseye = "bullseye"
, Jammy = "jammy"
, Focal = "focal"
, Noble = "noble"
}
docker

Expand All @@ -42,39 +44,11 @@ let dependsOnStep =

let key = "${Artifacts.lowerName binary}-${suffix}"

in merge
{ Bookworm =
[ { name =
"${prefix}${capitalName
docker}${network}${profileSuffix}"
, key = key
}
]
, Bullseye =
[ { name =
"${prefix}${capitalName
docker}${network}${profileSuffix}"
, key = key
}
]
, Jammy =
[ { name =
"${prefix}${capitalName
docker}${network}${capitalName
docker}${profileSuffix}"
, key = key
}
]
, Focal =
[ { name =
"${prefix}${capitalName
docker}${network}${capitalName
docker}${profileSuffix}"
, key = key
}
]
in [ { name =
"${prefix}${capitalName docker}${network}${profileSuffix}"
, key = key
}
docker
]

let dependsOn =
\(docker : Docker)
Expand Down
2 changes: 2 additions & 0 deletions buildkite/src/Constants/Toolchain.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ let runner =
, Bullseye = RunInToolchain.runInToolchainBullseye
, Jammy = RunInToolchain.runInToolchainBookworm
, Focal = RunInToolchain.runInToolchainBullseye
, Noble = RunInToolchain.runInToolchainBullseye
}
debVersion

Expand All @@ -35,6 +36,7 @@ let image =
, Bullseye = ContainerImages.minaToolchainBullseye
, Jammy = ContainerImages.minaToolchainBookworm
, Focal = ContainerImages.minaToolchainBullseye
, Noble = ContainerImages.minaToolchainBullseye
}
debVersion

Expand Down
27 changes: 27 additions & 0 deletions buildkite/src/Jobs/Release/MinaArtifactNobleDevnet.dhall
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
let ArtifactPipelines = ../../Command/MinaArtifact.dhall

let DebianVersions = ../../Constants/DebianVersions.dhall

let Artifacts = ../../Constants/Artifacts.dhall

let Pipeline = ../../Pipeline/Dsl.dhall

let PipelineTag = ../../Pipeline/Tag.dhall

let Network = ../../Constants/Network.dhall

in Pipeline.build
( ArtifactPipelines.pipeline
ArtifactPipelines.MinaBuildSpec::{
, artifacts =
[ Artifacts.Type.Daemon
, Artifacts.Type.LogProc
, Artifacts.Type.Archive
, Artifacts.Type.Rosetta
, Artifacts.Type.ZkappTestTransaction
]
, network = Network.Type.Devnet
, tags = [ PipelineTag.Type.Docker ]
, debVersion = DebianVersions.DebVersion.Noble
}
)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ in Pipeline.build
, Artifacts.Type.TestExecutive
, Artifacts.Type.Rosetta
]
, tags = [ PipelineTag.Type.Debian ]
, tags = [ PipelineTag.Type.Docker ]
, channel = DebianChannel.Type.Experimental
, prefix = "MinaArtifactOnlyDebian"
}
Expand Down
1 change: 1 addition & 0 deletions changes/17267.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This PR introduce Ubuntu Noble Docker build & Debian package build
1 change: 0 additions & 1 deletion dockerfiles/Dockerfile-mina-archive
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ RUN apt-get update --quiet --yes \
curl \
jq \
dumb-init \
libssl1.1 \
libgomp1 \
libpq-dev \
gnupg2 \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile-mina-daemon
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
# libffi7
# libprocps8
# libjemalloc2
# libssl

# Dependencies
RUN apt-get update --quiet --yes \
Expand All @@ -41,7 +42,6 @@ RUN apt-get update --quiet --yes \
jq \
libgmp10 \
libgomp1 \
libssl1.1 \
libpq-dev \
procps \
python3 \
Expand All @@ -63,8 +63,8 @@ RUN echo "Building image with version $deb_version from repo $deb_release $deb_c
&& echo "deb [trusted=yes] ${deb_repo} $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
&& apt-get update --quiet --yes \
&& apt-get install --quiet --yes --allow-downgrades "${MINA_DEB}=$deb_version" \
&& apt-get install --quiet --yes --allow-downgrades "mina-create-legacy-genesis=1.4.0beta2-compatible-97f7d8c" \
&& rm -rf /var/lib/apt/lists/*
# && apt-get install --quiet --yes --allow-downgrades "mina-create-legacy-genesis=1.4.0beta2-compatible-97f7d8c" \


# Move to a non-root UID in the future (specifically 50000, as it is memorable and safely within the bounds of most systems)
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile-mina-rosetta
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
# libffi7
# libprocps8
# libjemalloc2
# libssl


# --- Dependencies across many platforms
Expand All @@ -43,7 +44,6 @@ RUN apt-get update --quiet --yes \
gnupg2 \
libgmp10 \
libgomp1 \
libssl1.1 \
tzdata \
jq \
git \
Expand Down
1 change: 0 additions & 1 deletion dockerfiles/Dockerfile-zkapp-test-transaction
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ RUN apt-get -y update \
curl \
jq \
dumb-init \
libssl1.1 \
apt-transport-https \
ca-certificates \
dnsutils \
Expand Down
2 changes: 1 addition & 1 deletion opam.export
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ installed: [
"conf-g++.1.0"
"conf-gmp.2"
"conf-libffi.2.0.0"
"conf-libssl.2"
"conf-libssl.3"
"conf-m4.1"
"conf-perl.1"
"conf-pkg-config.1.1"
Expand Down
11 changes: 8 additions & 3 deletions scripts/debian/builder-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,28 @@ cd "${SCRIPTPATH}/../../_build"
GITHASH=$(git rev-parse --short=7 HEAD)
GITHASH_CONFIG=$(git rev-parse --short=8 --verify HEAD)

# Set dependencies based on debian release
SHARED_DEPS="libssl1.1, libgmp10, libgomp1, tzdata, rocksdb-tools"

SUGGESTED_DEPS="jq, curl, wget"

TEST_EXECUTIVE_DEPS=", mina-logproc, python3, docker"

case "${MINA_DEB_CODENAME}" in
noble)
SHARED_DEPS="libssl3t64, libgmp10, libgomp1, tzdata, rocksdb-tools"
DAEMON_DEPS=", libffi8, libjemalloc2, libpq-dev, libproc2-0 , mina-logproc"
ARCHIVE_DEPS="libssl3t64, libgomp1, libpq-dev, libjemalloc2"
;;
bookworm|jammy)
SHARED_DEPS="libssl1.1, libgmp10, libgomp1, tzdata, rocksdb-tools"
DAEMON_DEPS=", libffi8, libjemalloc2, libpq-dev, libprocps8, mina-logproc"
ARCHIVE_DEPS="libssl1.1, libgomp1, libpq-dev, libjemalloc2"
;;
bullseye|focal)
SHARED_DEPS="libssl1.1, libgmp10, libgomp1, tzdata, rocksdb-tools"
DAEMON_DEPS=", libffi7, libjemalloc2, libpq-dev, libprocps8, mina-logproc"
ARCHIVE_DEPS="libssl1.1, libgomp1, libpq-dev, libjemalloc2"
;;
stretch|bionic)
SHARED_DEPS="libssl1.1, libgmp10, libgomp1, tzdata, rocksdb-tools"
DAEMON_DEPS=", libffi6, libjemalloc1, libpq-dev, libprocps6, mina-logproc"
ARCHIVE_DEPS="libssl1.1, libgomp1, libpq-dev, libjemalloc1"
;;
Expand Down
4 changes: 2 additions & 2 deletions scripts/debian/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ SCRIPT=' export DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
'

case $CODENAME in
bullseye) DOCKER_IMAGE="debian:bullseye" ;;
focal) DOCKER_IMAGE="ubuntu:focal" ;;
bullseye) DOCKER_IMAGE="debian:$CODENAME" ;;
focal|noble) DOCKER_IMAGE="ubuntu:$CODENAME" ;;
*) echo "❌ Unknown codename passed: $CODENAME"; exit 1;;
esac

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export VALID_SERVICES=('mina-archive' 'mina-daemon' 'mina-rosetta' 'mina-test-su
function export_base_image () {
# Determine the proper image for ubuntu or debian
case "${DEB_CODENAME##*=}" in
bionic|focal|impish|jammy)
bionic|focal|impish|jammy|noble)
IMAGE="ubuntu:${DEB_CODENAME##*=}"
;;
stretch|buster|bullseye|bookworm|sid)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/snarky
Submodule snarky updated 1 files
+2 −2 opam.export