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

Use mina toolchain instead of ci-toolchain-base #15792

Closed
wants to merge 8 commits into from

Conversation

dkijania
Copy link
Member

@dkijania dkijania commented Jul 3, 2024

We are experiencing issues on merges jobs in CI. This PR is an attempt to fix this situation. We will use toolchain with git-lfs

@dkijania dkijania self-assigned this Jul 3, 2024
@dkijania dkijania requested a review from a team as a code owner July 3, 2024 20:44
@dkijania
Copy link
Member Author

dkijania commented Jul 3, 2024

!ci-build-me

dkijania added 5 commits July 3, 2024 23:05
This reverts commit 6907171ba8d2e938eac55d90d2afdcfbac514983.
This reverts commit 113fa24bd1c01f4e44a30209b049ec74477465e8.
This reverts commit d74012fd19091b7d13c84e76a3148cb98813fb5f.
This reverts commit 11dd5b0ed16ec48fe416a401b82b27c8723b3cbd.
@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

!ci-build-me

@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/_ci/use_mina_toolchain_for_merge_jobs_to_compatible && git merge ci/use_mina_toolchain_for_merge_jobs

Resolve conflict and then

git push

develop

git fetch && git checkout port/_ci/use_mina_toolchain_for_merge_jobs_to_develop && git merge ci/use_mina_toolchain_for_merge_jobs

Resolve conflict and then

git push

@dkijania
Copy link
Member Author

dkijania commented Jul 4, 2024

Porting branch #15795 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 #15796 to resolve conflict with develop created. Please merge it in order to solve conflict between head of this PR and develop

@dkijania
Copy link
Member Author

!ci-build-me

@dkijania
Copy link
Member Author

I will hold with merging this one as looks like disable smugding in CI solves issue

@dkijania dkijania closed this Jul 24, 2024
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.

None yet

2 participants