Copy OE into install dir #1125
Merged
Copy OE into install dir #1125
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
install_oe_deps@7840 aka 20200430.26 vs master ewma over 50 builds from 7360 to 7824 |
olgavrou
reviewed
Apr 30, 2020
| else | ||
| echo "Git tag ($git_tag) is later than CMake version ($cmake_version) - please update CMake version!" | ||
| exit 1 | ||
| echo "Skipping check - ${git_tag} doesn't look like semver" |
There was a problem hiding this comment.
semver? semantic versioning?
olgavrou
approved these changes
Apr 30, 2020
achamayou
approved these changes
Apr 30, 2020
| cmake_version=$(grep CCF_VERSION CMakeLists.txt | grep -Po "(\d)+(\.(\d)+)*") | ||
| # Check git tag is <= CMake version. Use sort --version-sort to handle semver (0.9 < 0.10) | ||
| if echo "$git_tag $cmake_version" | tr " " "\n" | sort --version-sort -c ; then | ||
| echo "Git tag ($git_tag) is safely <= CMake version ($cmake_version)" |
There was a problem hiding this comment.
Is < ever a good thing? It seems like we would want strict equality?
| # Find OpenEnclave package, preferring local version if found (in the install | ||
| # case) | ||
| find_package( | ||
| OpenEnclave 0.9 CONFIG PATHS ${CMAKE_CURRENT_LIST_DIR}/../openenclave |
There was a problem hiding this comment.
Hoist out version to a variable?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2-part fix for #1120:
Sample release available here until I delete it: https://github.com/microsoft/CCF/releases/tag/untagged-bfa184e16a4d52090092
This only increases the size of our install package slightly - from 55.4MB in 0.9.3 to 63.5MB on current master with OE.