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.

Sign up for GitHub

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

Jump to bottom

Develop2master 3081 corrections #3328

Merged
merged 3 commits into from
Apr 14, 2023
Merged

Develop2master 3081 corrections #3328

merged 3 commits into from
Apr 14, 2023

Conversation

baziorek
Copy link
Member

@baziorek baziorek commented Mar 24, 2023 •
edited by appetrosyan
Loading

Description

In the PR are changes listed in PR: #3081 which I can repair (connected with my changes or internship project where I was a mentor).

Linked issue

Closes #{issue_number}

Benefits

Better code quality. Closer to release Iroha 1.6.0

Checklist

  • I've read CONTRIBUTING.md
  • I've used the standard signed-off commit format (or will squash just before merging)
  • All applicable CI checks pass (or I promised to make them pass later)
  • (optional) I've written unit tests for the code changes - not required this time
  • I replied to all comments after code review, marking all implemented changes with thumbs up

@baziorek baziorek self-assigned this Mar 24, 2023
@baziorek baziorek changed the base branch from main to develop March 24, 2023 08:55
Corrections in MR: #3081 (develop -> master)
c2a1c07 
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
@baziorek baziorek force-pushed the develop2master_3081_corrections branch from 8d015af to a305629 Compare March 24, 2023 09:00
@baziorek baziorek mentioned this pull request Mar 24, 2023
Merged
@baziorek baziorek force-pushed the develop2master_3081_corrections branch 2 times, most recently from 0f8bb75 to c2a1c07 Compare March 31, 2023 15:50
appetrosyan
appetrosyan approved these changes Apr 11, 2023
View reviewed changes
Copy link
Contributor

@appetrosyan appetrosyan left a comment

Choose a reason for hiding this comment

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

LGTM

@baziorek
Copy link
Member Author

The PR is approved. But to merge I need to press "Update branch", after update more checks would fail (failing develop), so I'm attaching screens before updating the branch:
image
Details of failing tests (the same as in develop):
image

@baziorek
Copy link
Member Author

Here, in another MR: #3345
those checks are passing:
image
But building tests is still failing:(.
Fortunately it is not connected with changes to the MR: #3328

@appetrosyan appetrosyan merged commit fef6a34 into develop Apr 14, 2023
@appetrosyan appetrosyan deleted the develop2master_3081_corrections branch April 17, 2023 06:46
@nxsaken nxsaken added the iroha1 The legacy version of Iroha. label Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@appetrosyan appetrosyan appetrosyan approved these changes

Assignees

@baziorek baziorek

Labels
1.x 1.5 iroha1 The legacy version of Iroha.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@baziorek @appetrosyan @nxsaken