Skip to content

Commit

Permalink
Upgrade to OE 0.12 final (#1830)
Browse files Browse the repository at this point in the history
  • Loading branch information
achamayou authored Oct 28, 2020
1 parent 39db7a9 commit 23004b8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased
### Changed
- CCF now depends on [Open Enclave 0.12](https://github.com/openenclave/openenclave/releases/tag/v0.12.0).

### Fixed
- Added `tools.cmake` to the install , which `ccf_app.cmake` depends on and was missing from the previous release.

Expand Down
2 changes: 1 addition & 1 deletion cmake/cpack_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})

# CPack variables for Debian packages
set(CPACK_DEBIAN_PACKAGE_DEPENDS
"open-enclave (>=0.10.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8, libcurl4"
"open-enclave (>=0.12.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8, libcurl4"
)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

Expand Down
4 changes: 2 additions & 2 deletions getting_started/setup_vm/roles/openenclave/vars/common.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
oe_ver: "0.12.0-rc2"
oe_ver: "0.12.0"
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
oe_ver_: "0.12.0_rc2"
oe_ver_: "0.12.0"

# Source install
workspace: "/tmp/"
Expand Down

0 comments on commit 23004b8

Please sign in to comment.