Develop to Master #3081
Develop to Master #3081
Conversation
Signed-off-by: iceseer <iceseer@gmail.com>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
…:chrono::duration Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
… repair building of abseil library: std::max ambiguous call (#2902) Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl> Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
* Add Iroha select label Signed-off-by: safinsaf <safinsaft@gmail.com> * Fix stray space comments from review Signed-off-by: safinsaf <safinsaft@gmail.com> * Fix called jobs for git merge-commit in workflow Signed-off-by: safinsaf <safinsaft@gmail.com> Signed-off-by: safinsaf <safinsaft@gmail.com>
… repair building of benchmark library: std::numeric_limits requires <limits> header Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: safinsaf <safinsaft@gmail.com>
Signed-off-by: Andrzej <dekoderer@gmail.com>
Signed-off-by: Andrzej <dekoderer@gmail.com>
Added description for rpi Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Apply suggestion Co-authored-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru> Signed-off-by: G. Bazior <gbaz@o2.pl>
Corrected typo Signed-off-by: G. Bazior <bazior@agh.edu.pl>
There was a problem hiding this comment.
I was able to review 40/56 files connected with features/documentation/internship project in which I was participating. Here is file list of what was reviewed by me and it is OK (files are marked as "Viewed"):
About rest of files I don't have knowledge. But maybe if You provide more information e.g.:
how the MergeRequest was tested (which commands) and what was results I will be able to review also rest of files.
Here is list of files which I was unable to review:
It looks that all C++ files not reviewed by me are from this commit: #2749 (made by Alexander). Changes to yml files are made here: #2903 (made by @safinsaf) and cef5e4d (also made by @safinsaf ) |
| # ${{env.HOME}}/.cache/vcpkg/archives | ||
| # key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }} | ||
| # restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}. | ||
| name: Build iroha vcpkg dependancies |
There was a problem hiding this comment.
| name: Build iroha vcpkg dependancies | |
| name: Build iroha vcpkg dependencies |
|
I reviewed the code, while there are a few things which I would have done differently, there's no problem with that in principle. |
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Co-authored-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru> Signed-off-by: G. Bazior <gbaz@o2.pl> Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru>
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl> Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
|
@appetrosyan I've corrected changes applied to me in another PR: #3328 About failing build: About MacOs: EDIT: It is similar thing to what I fixed (I hope it is similar): |
So now I should make path to vcpkg packages which would remove |
Signed-off-by: safinsaf <safinsaft@gmail.com>
Signed-off-by: safinsaf <safinsaft@gmail.com>
Signed-off-by: safinsaf <safinsaft@gmail.com>
2. Removed incorrect patches to vcpkg libraries after VCPKG version bump 3. Fixed building for irohad and iroha-cli after after VCPKG version bump (and 3rd part libraries version bump) Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Signed-off-by: safinsaf <safinsaft@gmail.com>
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl> Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
|
@appetrosyan Your suggestions was corrected in #3328, which was merged. Building tests is failing, but if somebody tries to build Iroha according to documentation: https://iroha.readthedocs.io/en/main/build/index.html#id9 everything should work. I think nobody (who is beginner with Iroha) would like to build tests: |
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl> Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
Description of the Change
Routine merging of changes from Develop to Main.
Issue
N/A
Benefits
Release 1.7.0
Possible Drawbacks
None