Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into sai/remove-connect…
Browse files Browse the repository at this point in the history
…-to-berkeley
  • Loading branch information
sai committed Aug 15, 2024
2 parents 1312200 + 2073ce7 commit 10e0232
Show file tree
Hide file tree
Showing 142 changed files with 434 additions and 52,119 deletions.
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ replayer: ocaml_checks
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/replayer/replayer.exe --profile=devnet
$(info Build complete)

delegation_compliance: ocaml_checks
replayer: ocaml_checks
$(info Starting Build)
(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && dune build src/app/delegation_compliance/delegation_compliance.exe --profile=testnet_postake_medium_curves
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/replayer/replayer.exe --profile=devnet
$(info Build complete)

missing_blocks_auditor: ocaml_checks
Expand All @@ -147,12 +147,7 @@ archive_blocks: ocaml_checks

patch_archive_test: ocaml_checks
$(info Starting Build)
(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && dune build src/app/patch_archive_test/patch_archive_test.exe --profile=testnet_postake_medium_curves
$(info Build complete)

swap_bad_balances: ocaml_checks
$(info Starting Build)
(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && dune build src/app/swap_bad_balances/swap_bad_balances.exe --profile=testnet_postake_medium_curves
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/patch_archive_test/patch_archive_test.exe --profile=testnet_postake_medium_curves
$(info Build complete)

heap_usage: ocaml_checks
Expand Down Expand Up @@ -309,4 +304,4 @@ ml-docs: ocaml_checks
# https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
# HACK: cat Makefile | egrep '^\w.*' | sed 's/:/ /' | awk '{print $1}' | grep -v myprocs | sort | xargs

.PHONY: all build check-format clean deb dev mina-docker reformat doc_diagrams ml-docs macos-setup setup-opam libp2p_helper dhall_types replayer missing_blocks_auditor extract_blocks archive_blocks ocaml_version ocaml_word_size ocaml_checks
.PHONY: all build check-format clean deb dev mina-docker reformat doc_diagrams ml-docs macos-setup macos-setup-download setup-opam libp2p_helper dhall_types replayer missing_blocks_auditor extract_blocks archive_blocks ocaml_version ocaml_word_size ocaml_checks
3 changes: 0 additions & 3 deletions buildkite/scripts/build-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@ dune build "--profile=${DUNE_PROFILE}" $INSTRUMENTED_PARAM \
src/app/replayer/replayer.exe \
src/app/extract_blocks/extract_blocks.exe \
src/app/archive_blocks/archive_blocks.exe \
src/app/last_vrf_output_to_b64/last_vrf_output_to_b64.exe \
src/app/receipt_chain_hash_to_b58/receipt_chain_hash_to_b58.exe \
src/app/batch_txn_tool/batch_txn_tool.exe \
src/app/missing_blocks_auditor/missing_blocks_auditor.exe \
src/app/swap_bad_balances/swap_bad_balances.exe \
src/app/zkapp_test_transaction/zkapp_test_transaction.exe \
src/app/rosetta/rosetta_testnet_signatures.exe \
src/app/rosetta/indexer_test/indexer_test.exe \
Expand Down
15 changes: 1 addition & 14 deletions buildkite/src/Command/MinaArtifact.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,7 @@ let docker_step
}
)
networks
, TestExecutive =
[ DockerImage.ReleaseSpec::{
, deps = deps
, service = "mina-test-executive"
, deb_codename = "${DebianVersions.lowerName debVersion}"
, deb_profile = profile
, build_flags = buildFlags
, deb_repo = DebianRepo.Type.Local
, step_key =
"test-executive-${DebianVersions.lowerName
debVersion}${BuildFlags.toLabelSegment
buildFlags}--docker-image"
}
]
, TestExecutive = [] : List DockerImage.ReleaseSpec.Type
, BatchTxn =
[ DockerImage.ReleaseSpec::{
, deps = deps
Expand Down
1 change: 0 additions & 1 deletion buildkite/src/Jobs/Release/MinaArtifactBuster.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ in Pipeline.build
[ Artifacts.Type.Daemon
, Artifacts.Type.Archive
, Artifacts.Type.BatchTxn
, Artifacts.Type.TestExecutive
, Artifacts.Type.Rosetta
, Artifacts.Type.ZkappTestTransaction
]
Expand Down
108 changes: 0 additions & 108 deletions dockerfiles/Dockerfile-mina-test-executive

This file was deleted.

37 changes: 0 additions & 37 deletions frontend/archive-node-blocks/README.md

This file was deleted.

1 change: 0 additions & 1 deletion frontend/archive-node-blocks/create_schema.sql

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/archive-node-blocks/drop-db.sh

This file was deleted.

144 changes: 0 additions & 144 deletions frontend/archive-node-blocks/index.js

This file was deleted.

9 changes: 0 additions & 9 deletions frontend/archive-node-blocks/make-postgres-db.sh

This file was deleted.

Loading

0 comments on commit 10e0232

Please sign in to comment.