From 23004b8b9c0f3d2cf3292d7db25153d9d47f976f Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 28 Oct 2020 10:16:48 +0000 Subject: [PATCH] Upgrade to OE 0.12 final (#1830) --- CHANGELOG.md | 3 +++ cmake/cpack_settings.cmake | 2 +- getting_started/setup_vm/roles/openenclave/vars/common.yml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d00656670da..0de6e72ff49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake index 32886cbd783..95584030bb2 100644 --- a/cmake/cpack_settings.cmake +++ b/cmake/cpack_settings.cmake @@ -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) diff --git a/getting_started/setup_vm/roles/openenclave/vars/common.yml b/getting_started/setup_vm/roles/openenclave/vars/common.yml index 689ac6c5385..a783238bdfc 100644 --- a/getting_started/setup_vm/roles/openenclave/vars/common.yml +++ b/getting_started/setup_vm/roles/openenclave/vars/common.yml @@ -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/"