This commit is contained in:
Amaury Chamayou 2020-12-16 14:12:21 +00:00 коммит произвёл GitHub
Родитель 03e1d797fe
Коммит 81da8fc3f0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 11 добавлений и 11 удалений

Просмотреть файл

@ -7,7 +7,7 @@ trigger:
jobs:
- job: build_and_publish_docs
container: ccfciteam/ccf-ci:oe0.13.0rc2
container: ccfciteam/ccf-ci:oe0.13.0
pool:
vmImage: ubuntu-18.04

Просмотреть файл

@ -25,11 +25,11 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfciteam/ccf-ci:oe0.13.0rc2
image: ccfciteam/ccf-ci:oe0.13.0
options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
- container: sgx
image: ccfciteam/ccf-ci:oe0.13.0rc2
image: ccfciteam/ccf-ci:oe0.13.0
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
variables:

Просмотреть файл

@ -21,11 +21,11 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfciteam/ccf-ci:oe0.13.0rc2
image: ccfciteam/ccf-ci:oe0.13.0
options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
- container: sgx
image: ccfciteam/ccf-ci:oe0.13.0rc2
image: ccfciteam/ccf-ci:oe0.13.0
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
jobs:

Просмотреть файл

@ -20,7 +20,7 @@ schedules:
resources:
containers:
- container: sgx
image: ccfciteam/ccf-ci:oe0.13.0rc2
image: ccfciteam/ccf-ci:oe0.13.0
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
jobs:

Просмотреть файл

@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Error responses of built-in endpoints are now JSON and follow the OData schema (#1919).
- Code ids are now deleted rather than marked as `RETIRED`. `ACTIVE` is replaced with the more precise `ALLOWED_TO_JOIN`. (#1996)
- CCF now depends on [Open Enclave 0.13](https://github.com/openenclave/openenclave/releases/tag/v0.13.0-rc2).
- CCF now depends on [Open Enclave 0.13](https://github.com/openenclave/openenclave/releases/tag/v0.13.0).
## Fixed

Просмотреть файл

@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
endif()
# Find OpenEnclave package
find_package(OpenEnclave 0.10 CONFIG REQUIRED)
find_package(OpenEnclave 0.13 CONFIG REQUIRED)
# As well as pulling in openenclave:: targets, this sets variables which can be
# used for our edge cases (eg - for virtual libraries). These do not follow the
# standard naming patterns, for example use OE_INCLUDEDIR rather than

Просмотреть файл

@ -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.12.9), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
"open-enclave (>=0.13.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

Просмотреть файл

@ -1,6 +1,6 @@
oe_ver: "0.13.0-rc2"
oe_ver: "0.13.0"
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
oe_ver_: "0.13.0_rc2"
oe_ver_: "0.13.0"
# Source install
workspace: "/tmp/"