Skip to content

Commit

Permalink
Merge pull request #15799 from MinaProtocol/port/_dkijania/remove_ber…
Browse files Browse the repository at this point in the history
…keley_migration_apps_to_develop

[Merge Conflict Fix] port 'Remove migration apps and jobs from master' to develop
  • Loading branch information
dkijania authored Jul 26, 2024
2 parents 40e2aeb + 7668a5d commit 75cafde
Show file tree
Hide file tree
Showing 36 changed files with 35 additions and 5,998 deletions.
2 changes: 0 additions & 2 deletions buildkite/scripts/build-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ 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/berkeley_migration/berkeley_migration.exe \
src/app/berkeley_migration_verifier/berkeley_migration_verifier.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 \
Expand Down
2 changes: 1 addition & 1 deletion buildkite/scripts/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ echo "--- Prepare debian packages"
./scripts/rebuild-deb.sh $@

echo "--- Git diff after build is complete:"
git diff --exit-code -- .
git diff --exit-code -- .
14 changes: 0 additions & 14 deletions buildkite/src/Command/MinaArtifact.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,6 @@ let docker_step
buildFlags}-docker-image"
}
]
, ArchiveMigration =
[ DockerImage.ReleaseSpec::{
, deps = deps
, service = "mina-archive-migration"
, deb_codename = "${DebianVersions.lowerName debVersion}"
, build_flags = buildFlags
, deb_repo = DebianRepo.Type.Local
, deb_profile = profile
, step_key =
"archive-migration-${DebianVersions.lowerName
debVersion}${BuildFlags.toLabelSegment
buildFlags}--docker-image"
}
]
, Rosetta =
[ DockerImage.ReleaseSpec::{
, deps = deps
Expand Down
12 changes: 1 addition & 11 deletions buildkite/src/Constants/Artifacts.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ let Artifact
: Type
= < Daemon
| Archive
| ArchiveMigration
| TestExecutive
| BatchTxn
| Rosetta
Expand All @@ -23,7 +22,6 @@ let Artifact
let AllButTests =
[ Artifact.Daemon
, Artifact.Archive
, Artifact.ArchiveMigration
, Artifact.BatchTxn
, Artifact.TestExecutive
, Artifact.Rosetta
Expand All @@ -39,7 +37,6 @@ let capitalName =
-> merge
{ Daemon = "Daemon"
, Archive = "Archive"
, ArchiveMigration = "ArchiveMigration"
, TestExecutive = "TestExecutive"
, BatchTxn = "BatchTxn"
, Rosetta = "Rosetta"
Expand All @@ -53,7 +50,6 @@ let lowerName =
-> merge
{ Daemon = "daemon"
, Archive = "archive"
, ArchiveMigration = "archive_migration"
, TestExecutive = "test_executive"
, BatchTxn = "batch_txn"
, Rosetta = "rosetta"
Expand All @@ -68,7 +64,6 @@ let dockerName =
{ Daemon = "mina-daemon"
, Archive = "mina-archive"
, TestExecutive = "mina-test-executive"
, ArchiveMigration = "mina-archive-migration"
, BatchTxn = "mina-batch-txn"
, Rosetta = "mina-rosetta"
, ZkappTestTransaction = "mina-zkapp-test-transaction"
Expand All @@ -82,7 +77,6 @@ let toDebianName =
-> merge
{ Daemon = "daemon_${Network.lowerName network}"
, Archive = "archive"
, ArchiveMigration = "archive_migration"
, TestExecutive = "test_executive"
, BatchTxn = "batch_txn"
, Rosetta = ""
Expand All @@ -104,12 +98,9 @@ let toDebianNames =
Prelude.List.map
Network.Type
Text
( \(n : Network.Type)
-> "daemon_${Network.lowerName n}"
)
(\(n : Network.Type) -> toDebianName a n)
networks
, Archive = [ "archive" ]
, ArchiveMigration = [ "archive_migration" ]
, TestExecutive = [ "test_executive" ]
, BatchTxn = [ "batch_txn" ]
, Rosetta = [ "" ]
Expand Down Expand Up @@ -152,7 +143,6 @@ let dockerTag =
"${version_and_codename}-${Network.lowerName
network}${profile_part}"
, Archive = "${version_and_codename}"
, ArchiveMigration = "${version_and_codename}"
, TestExecutive = "${version_and_codename}"
, BatchTxn = "${version_and_codename}"
, Rosetta = "${version_and_codename}"
Expand Down
11 changes: 1 addition & 10 deletions buildkite/src/Constants/DebianPackage.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,14 @@ let Package
: Type
= < Daemon
| Archive
| ArchiveMigration
| TestExecutive
| BatchTxn
| LogProc
| ZkappTestTransaction
| FunctionalTestSuite
>

let MainPackages =
[ Package.Daemon
, Package.Archive
, Package.ArchiveMigration
, Package.LogProc
]
let MainPackages = [ Package.Daemon, Package.Archive, Package.LogProc ]

let AuxiliaryPackages =
[ Package.TestExecutive
Expand All @@ -33,7 +27,6 @@ let capitalName =
-> merge
{ Daemon = "Daemon"
, Archive = "Archive"
, ArchiveMigration = "ArchiveMigration"
, TestExecutive = "TestExecutive"
, BatchTxn = "BatchTxn"
, LogProc = "Logproc"
Expand All @@ -47,7 +40,6 @@ let lowerName =
-> merge
{ Daemon = "daemon"
, Archive = "archive"
, ArchiveMigration = "archive_migration"
, TestExecutive = "test_executive"
, BatchTxn = "batch_txn"
, LogProc = "logproc"
Expand All @@ -65,7 +57,6 @@ let debianName =
"mina-${Network.lowerName network}${Profile.toLabelSegment
profile}"
, Archive = "mina-archive"
, ArchiveMigration = "mina-archive-migration"
, TestExecutive = "mina-test-executive"
, BatchTxn = "mina-batch-txn"
, LogProc = "mina-logproc"
Expand Down
1 change: 0 additions & 1 deletion buildkite/src/Jobs/Release/MinaArtifactBullseye.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ in Pipeline.build
, artifacts =
[ Artifacts.Type.Daemon
, Artifacts.Type.Archive
, Artifacts.Type.ArchiveMigration
, Artifacts.Type.BatchTxn
, Artifacts.Type.TestExecutive
, Artifacts.Type.Rosetta
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 @@ -12,7 +12,6 @@ in Pipeline.build
, artifacts =
[ Artifacts.Type.Daemon
, Artifacts.Type.Archive
, Artifacts.Type.ArchiveMigration
, Artifacts.Type.BatchTxn
, Artifacts.Type.TestExecutive
, Artifacts.Type.Rosetta
Expand Down
1 change: 0 additions & 1 deletion buildkite/src/Jobs/Release/MinaArtifactFocal.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ in Pipeline.build
, artifacts =
[ Artifacts.Type.Daemon
, Artifacts.Type.Archive
, Artifacts.Type.ArchiveMigration
, Artifacts.Type.BatchTxn
, Artifacts.Type.TestExecutive
, Artifacts.Type.Rosetta
Expand Down
66 changes: 0 additions & 66 deletions dockerfiles/Dockerfile-mina-archive-migration

This file was deleted.

23 changes: 0 additions & 23 deletions helm/cron_jobs/berkeley-migration-complete-cronjob/.helmignore

This file was deleted.

24 changes: 0 additions & 24 deletions helm/cron_jobs/berkeley-migration-complete-cronjob/Chart.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions helm/cron_jobs/berkeley-migration-complete-cronjob/README.md

This file was deleted.

Loading

0 comments on commit 75cafde

Please sign in to comment.