-
Notifications
You must be signed in to change notification settings - Fork 277
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
Trying to fix sfinae problems by reverting vcpkg upgrade (Iroha 1) #3852
Trying to fix sfinae problems by reverting vcpkg upgrade (Iroha 1) #3852
Conversation
5d5330a
to
29bd61d
Compare
This reverts commit fdc2c1e. Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]>
This reverts commit 3b40f22. Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]>
Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]>
267ef5e
to
38d725b
Compare
In the last commit (38d725b) I was trying to fix the test
As I checked now: Iroha 1.5 (https://github.com/hyperledger/iroha/releases/tag/1.5.0) does not change anything in schema after version 1.4. So I've added extra parameter which disables checking of schema version. This argument is used in tests. It is not perfect solution. In future probably the tool needs to be updated to support scheme after changes. |
…yperledger-iroha#3852) * Revert "Update vcpkg from last release" This reverts commit fdc2c1e. * Revert "1. Added path to fix building benchmark library on MacOS" This reverts commit 3b40f22. * Trying to fix iroha_wsv_diff tool Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]> --------- Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]> Co-authored-by: Grzegorz Bazior (Yodiss PSA) <[email protected]>
Description
Some time ago vcpkg package manager was bumped to newest version (commit: fdc2c1e). It caused dependencies to upgrade a lot so project stopped to compile. I was able to fix compilation of binaries (commit: 3b40f22) but I was unable to fix compilation of tests (SFINAE problem) after some time of trying.
So I decided that we need to make project compiling with not the most professional way, but it should work (and be first step for more professional way). The way is to revert those commits:
After those reverts it compiled locally (I used docker:
docker run -it --name='Ubuntu_under_test_22.04' -v ${PWD}/./:/home/ --workdir=/home/ ubuntu:22.04
withg++ (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
) - both binaries and tests compiled with commands:For now I want to check if CI is compiling, that is why the PR is not ready for review yet.
Difference between versions
Version compare in table (generated by ChatGpt, so there can be mistakes):
vcpkg_libraries_new.txt
vcpkg_libraries_old.txt
Future plans:
If my fix works packages can be upgraded one by one until we face the SFINAE problem again - that package/packages would stay in older version. Of course this can be done in another PR.
Linked issue
Closes #{issue_number}
Benefits
Iroha 1 starts compilling again and another release 1.6 would be possible.
Checklist
CONTRIBUTING.md