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

Upgrade to CCF 3.0.13 #147

Closed
wants to merge 15 commits into from
Closed

Upgrade to CCF 3.0.13 #147

wants to merge 15 commits into from

Conversation

vimauro
Copy link
Member

@vimauro vimauro commented Aug 29, 2023 •
edited
Loading

This PR upgrades CCF to version 3.0.13. This is an intermediate step before moving to 4.x/5.x .

Upgraded to clang-11 for SGX and clang-15 for Virtual builds since those are CCF 3.0.13 requirements (https://github.com/microsoft/CCF/releases/tag/ccf-3.0.13)

andpiccione
andpiccione reviewed Aug 29, 2023
View reviewed changes
Copy link
Member

@andpiccione andpiccione left a comment

Choose a reason for hiding this comment

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

Overall, lgtm. But I believe we cannot safely merge this PR until we re-enable the build for SGX to validate that all test scenarios pass in every platform

build.sh Outdated Show resolved Hide resolved
@vimauro
Copy link
Member Author

vimauro commented Aug 29, 2023

Addressed #141 by upgrading to 3.0.13

ivarprudnikov
ivarprudnikov requested changes Aug 30, 2023
View reviewed changes
.github/workflows/build-test-virtual.yml
@@ -27,7 +27,7 @@ jobs:
# Work-around for https://github.com/actions/runner/issues/2033
- name: Work around git safe.directory in container
run: chown -R $(id -u):$(id -g) $PWD
- run: apt-get update && apt-get install -y libcurl4-openssl-dev faketime clang-tidy-10
- run: apt-get update && apt-get install -y libcurl4-openssl-dev faketime clang-tidy-12
Copy link
Member

Choose a reason for hiding this comment

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

why are you changing this? Is it related to the move to 3.0.13?

Copy link
Member Author

Choose a reason for hiding this comment

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

not necessarily, just wanted to use a more recent version. The format errors currently flagged in the CI pipeline are occurring also with clang-tidy-10 , I'm working on those rn

build.sh Show resolved Hide resolved
@ivarprudnikov
Copy link
Member

ivarprudnikov commented Aug 30, 2023 •
edited
Loading

You'd need to change clang-format-10 to clang-format-11 in check-format.sh like in https://github.com/microsoft/CCF/blob/main/scripts/check-format.sh

Please also elaborate on the changes in the the issue description, e.g. why changing clang versions as well

@vimauro
Copy link
Member Author

vimauro commented Aug 30, 2023

You'd need to change clang-format-10 to clang-format-11 in check-format.sh like in https://github.com/microsoft/CCF/blob/main/scripts/check-format.sh

Please also elaborate on the changes in the the issue description, e.g., why changing clang versions as well

Added more details in the description.
clang-format-11 is giving me some command not found errors, will keep it to clang-format-10 for the moment if that's ok

@vimauro vimauro closed this Aug 31, 2023
@vimauro vimauro deleted the users/vimauro/upgrade_ccf branch September 1, 2023 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andpiccione andpiccione andpiccione left review comments

@ivarprudnikov ivarprudnikov ivarprudnikov requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vimauro @ivarprudnikov @andpiccione