Skip to content

Commit d4f58a7

Browse files
dkijaniadannywillems
authored andcommitted
build archive for each network
1 parent f4c50fa commit d4f58a7

File tree

6 files changed

+60
-22
lines changed

6 files changed

+60
-22
lines changed

buildkite/src/Constants/Artifacts.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ let toDebianName =
109109
{ Daemon = "daemon_${Network.lowerName network}"
110110
, DaemonHardfork = ""
111111
, LogProc = "logproc"
112-
, Archive = "archive"
112+
, Archive = "archive_${Network.lowerName network}"
113113
, TestExecutive = "test_executive"
114114
, BatchTxn = "batch_txn"
115115
, Rosetta = "rosetta_${Network.lowerName network}"

dockerfiles/Dockerfile-mina-archive

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ FROM ${image}
55
ARG deb_version
66
ARG deb_codename=bullseye
77
ARG deb_release=unstable
8+
ARG network=mainnet
89
ARG deb_repo="http://packages.o1test.net"
910
ARG deb_profile
1011
ARG deb_suffix
@@ -15,7 +16,7 @@ ENV SUFFIX=${deb_suffix:+-${deb_suffix}}
1516
# possible values:
1617
# - mina-archive
1718
# - mina-archive-lightnet etc.
18-
ENV MINA_DEB=mina-archive${SUFFIX}
19+
ENV MINA_DEB=mina-archive-${network}${SUFFIX}
1920

2021
ENV DEBIAN_FRONTEND noninteractive
2122
RUN echo "Building image with version $deb_codename $deb_release $deb_version"

dockerfiles/Dockerfile-mina-rosetta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ RUN mkdir -p --mode=700 ${MINA_CONFIG_DIR}/wallets/store/ \
102102
RUN echo "Building image with version $deb_version from repo $deb_release $deb_codename for network $network" \
103103
&& echo "deb [trusted=yes] ${deb_repo} $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
104104
&& apt-get update --quiet --yes \
105-
&& apt-get install --quiet --yes --allow-downgrades "mina-$network=$deb_version" "mina-rosetta-$network=$deb_version" "mina-archive=$deb_version" "mina-zkapp-test-transaction=$deb_version" \
105+
&& apt-get install --quiet --yes --allow-downgrades "mina-$network=$deb_version" "mina-rosetta-$network=$deb_version" "mina-archive-$network=$deb_version" "mina-zkapp-test-transaction=$deb_version" \
106106
&& rm -rf /var/lib/apt/lists/*
107107

108108
# --- Set up postgres

dockerfiles/Dockerfile-mina-test-suite

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN locale-gen en_US.UTF-8
7676
RUN echo "Building image with version $deb_version from repo $deb_release $deb_codename " \
7777
&& echo "deb [trusted=yes] ${deb_repo} $deb_codename $deb_release" > /etc/apt/sources.list.d/o1.list \
7878
&& apt-get update --quiet --yes \
79-
&& apt-get install --quiet --yes --allow-downgrades -o Dpkg::Options::="--force-overwrite" "mina-test-suite=$deb_version" "mina-$network-instrumented=$deb_version" "mina-archive-instrumented=$deb_version" \
79+
&& apt-get install --quiet --yes --allow-downgrades -o Dpkg::Options::="--force-overwrite" "mina-test-suite=$deb_version" "mina-$network-instrumented=$deb_version" "mina-archive-$network-instrumented=$deb_version" \
8080
&& rm -rf /var/lib/apt/lists/*
8181

8282
ENTRYPOINT ["sleep","infinity"]

scripts/debian/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ if [ $# -eq 0 ]
2424
echo "No arguments supplied. Building all known debian packages"
2525
build_logproc_deb
2626
build_keypair_deb
27-
build_archive_deb
27+
build_archive_berkeley_deb
28+
build_archive_devnet_deb
29+
build_archive_mainnet_deb
2830
build_batch_txn_deb
2931
build_daemon_berkeley_deb
3032
build_daemon_mainnet_deb

scripts/debian/builder-helpers.sh

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,16 @@ case "${MINA_DEB_CODENAME}" in
4343
;;
4444
esac
4545

46+
MINA_DEB_NAME="mina-berkeley"
47+
DEB_SUFFIX=""
48+
4649
# Add suffix to debian to distinguish different profiles (mainnet/devnet/lightnet)
4750
case "${DUNE_PROFILE}" in
48-
devnet|mainnet)
49-
MINA_DEB_NAME="mina-berkeley"
50-
DEB_SUFFIX=""
51-
;;
52-
*)
51+
lightnet)
5352
# use dune profile as suffix but replace underscore to dashes so deb builder won't complain
5453
_SUFFIX=${DUNE_PROFILE//_/-}
55-
MINA_DEB_NAME="mina-berkeley-${_SUFFIX}"
56-
DEB_SUFFIX="-${_SUFFIX}"
54+
DEB_SUFFIX="${_SUFFIX}"
55+
MINA_DEB_NAME="${MINA_DEB_NAME}-${DEB_SUFFIX}"
5756
;;
5857
esac
5958

@@ -394,16 +393,8 @@ build_daemon_berkeley_deb() {
394393
}
395394
##################################### END BERKELEY PACKAGE ######################################
396395

397-
##################################### ARCHIVE PACKAGE ###########################################
398-
build_archive_deb () {
399-
ARCHIVE_DEB=mina-archive${DEB_SUFFIX}
400-
401-
echo "------------------------------------------------------------"
402-
echo "--- Building archive deb"
403-
404-
405-
create_control_file "$ARCHIVE_DEB" "${ARCHIVE_DEPS}" 'Mina Archive Process
406-
Compatible with Mina Daemon'
396+
copy_common_archive_configs() {
397+
local ARCHIVE_DEB="${1}"
407398

408399
cp ./default/src/app/archive/archive.exe "${BUILDDIR}/usr/local/bin/mina-archive"
409400
cp ./default/src/app/archive_blocks/archive_blocks.exe "${BUILDDIR}/usr/local/bin/mina-archive-blocks"
@@ -419,10 +410,54 @@ build_archive_deb () {
419410
cp ../src/app/archive/drop_tables.sql "${BUILDDIR}/etc/mina/archive"
420411

421412
build_deb "$ARCHIVE_DEB"
413+
}
414+
415+
##################################### ARCHIVE DEVNET PACKAGE ###########################################
416+
build_archive_devnet_deb () {
417+
ARCHIVE_DEB=mina-archive-devnet
418+
419+
echo "------------------------------------------------------------"
420+
echo "--- Building archive devnet deb"
421+
422+
create_control_file "$ARCHIVE_DEB" "${ARCHIVE_DEPS}" 'Mina Archive Process
423+
Compatible with Mina Daemon'
424+
425+
copy_common_archive_configs "$ARCHIVE_DEB"
426+
427+
}
428+
##################################### END ARCHIVE DEVNET PACKAGE ########################################
429+
430+
##################################### ARCHIVE BERKELEY PACKAGE ###########################################
431+
build_archive_berkeley_deb () {
432+
ARCHIVE_DEB=mina-archive-berkeley${DEB_SUFFIX}
433+
434+
echo "------------------------------------------------------------"
435+
echo "--- Building archive berkeley deb"
436+
437+
438+
create_control_file "$ARCHIVE_DEB" "${ARCHIVE_DEPS}" 'Mina Archive Process
439+
Compatible with Mina Daemon'
440+
441+
copy_common_archive_configs "$ARCHIVE_DEB"
422442

423443
}
424444
##################################### END ARCHIVE PACKAGE ########################################
425445

446+
##################################### ARCHIVE MAINNET PACKAGE ###########################################
447+
build_archive_mainnet_deb () {
448+
ARCHIVE_DEB=mina-archive-mainnet
449+
450+
echo "------------------------------------------------------------"
451+
echo "--- Building archive mainnet deb"
452+
453+
create_control_file "$ARCHIVE_DEB" "${ARCHIVE_DEPS}" 'Mina Archive Process
454+
Compatible with Mina Daemon'
455+
456+
copy_common_archive_configs "$ARCHIVE_DEB"
457+
458+
}
459+
##################################### END ARCHIVE MAINNET PACKAGE ########################################
460+
426461

427462
##################################### ZKAPP TEST TXN #############################################
428463
build_zkapp_test_transaction_deb () {

0 commit comments

Comments
 (0)