Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove migration apps and jobs from master #15793

Merged
merged 6 commits into from
Jul 29, 2024

Conversation

dkijania
Copy link
Member

@dkijania dkijania commented Jul 3, 2024

After hardfork is done we can remove all migration apps, jobs and scripts from our repo

- migration jobs
- migration apps
- migration mode in replayer
@dkijania dkijania changed the base branch from develop to master July 3, 2024 23:08
@dkijania
Copy link
Member Author

dkijania commented Jul 3, 2024

!ci-build-me

@dkijania dkijania changed the title Merge pull request #15770 from MinaProtocol/master_nightly_test Remove migration apps and jobs from master Jul 4, 2024
@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

!help-merge-me

@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

Hello, @dkijania 2 new created to help you port this change to master. Please follow steps to resolve conflict for each mainline branch. PRs will be created automatically after you push merge to porting branches

compatible

git fetch && git checkout port/_dkijania/remove_berkeley_migration_apps_to_compatible && git merge dkijania/remove_berkeley_migration_apps

Resolve conflict and then

git push

develop

git fetch && git checkout port/_dkijania/remove_berkeley_migration_apps_to_develop && git merge dkijania/remove_berkeley_migration_apps

Resolve conflict and then

git push

@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

Porting branch #15798 to resolve conflict with compatible created. Please merge it in order to solve conflict between head of this PR and compatible

@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

Porting branch #15799 to resolve conflict with develop created. Please merge it in order to solve conflict between head of this PR and develop

This reverts commit 79e758e7172443b15377409d677abc0f0425c11a.
@dkijania
Copy link
Member Author

dkijania commented Jul 5, 2024

!ci-build-me

@dkijania
Copy link
Member Author

dkijania commented Jul 5, 2024

!ci-nightly-me

@dkijania
Copy link
Member Author

!ci-build-me

@dkijania
Copy link
Member Author

!ci-build-me

@dkijania
Copy link
Member Author

!ci-build-me

@dkijania dkijania marked this pull request as ready for review July 24, 2024 11:44
@dkijania dkijania requested review from a team as code owners July 24, 2024 11:44
@@ -2795,784 +2795,7 @@ index caa4203939..a2934a6184 100644
| Error e ->
[%log fatal]
~metadata:[ ("error", `String (Caqti_error.show e)) ]
diff --git a/src/app/berkeley_account_tables/berkeley_account_tables.ml b/src/app/berkeley_account_tables/berkeley_account_tables.ml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch was useful (it upgraded caqti which allowed us to optimize resource usage which was critical for replayer, but might appear to be critical for something else later)

Let's create a follow-up PR/issue to have this patched upstreamed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just removed diff for apps i removed. I will create follow up PR for applying this patch

@dkijania
Copy link
Member Author

!ci-build-me

@mrmr1993
Copy link
Member

!approved-for-mainnet

@mrmr1993 mrmr1993 merged commit 1284550 into master Jul 29, 2024
57 of 58 checks passed
@mrmr1993 mrmr1993 deleted the dkijania/remove_berkeley_migration_apps branch July 29, 2024 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants