зеркало из https://github.com/microsoft/CCF.git
Upgrade Open Enclave to 0.17.5 (#3284)
This commit is contained in:
Родитель
0432321c67
Коммит
623f403b81
|
@ -7,7 +7,7 @@ trigger:
|
|||
|
||||
jobs:
|
||||
- job: build_and_publish_docs
|
||||
container: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
container: ccfciteam/ccf-ci:oe0.17.5
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ parameters:
|
|||
|
||||
jobs:
|
||||
- job: build_v8
|
||||
container: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
container: ccfciteam/ccf-ci:oe0.17.5
|
||||
pool: 1es-dv4-focal
|
||||
|
||||
strategy:
|
||||
|
|
|
@ -27,11 +27,11 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: nosgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
||||
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
|
||||
|
||||
variables:
|
||||
|
|
|
@ -23,11 +23,11 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: nosgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
|
||||
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -9,7 +9,7 @@ on:
|
|||
jobs:
|
||||
checks:
|
||||
runs-on: ubuntu-20.04
|
||||
container: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
container: ccfciteam/ccf-ci:oe0.17.5
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
|
|
@ -16,7 +16,7 @@ pr:
|
|||
resources:
|
||||
containers:
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -21,7 +21,7 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.17.2-psw-2.15
|
||||
image: ccfciteam/ccf-ci:oe0.17.5
|
||||
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||
|
||||
- `ccf::historical::AbstractStateCache::drop_requests()` renamed to `drop_cached_states()` (#3187).
|
||||
|
||||
### Dependency
|
||||
|
||||
- Upgrade OpenEnclave from 0.17.2 to 0.17.5
|
||||
|
||||
## [2.0.0-dev6]
|
||||
|
||||
### Added
|
||||
|
|
|
@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
|
|||
endif()
|
||||
|
||||
# Find OpenEnclave package
|
||||
find_package(OpenEnclave 0.17.1 CONFIG REQUIRED)
|
||||
find_package(OpenEnclave 0.17.5 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
|
||||
|
|
|
@ -19,7 +19,7 @@ endif()
|
|||
|
||||
# CPack variables for Debian packages
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS
|
||||
"open-enclave (>=0.17.1), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10"
|
||||
"open-enclave (>=0.17.5), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10"
|
||||
)
|
||||
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
oe_ver: "0.17.2"
|
||||
oe_ver: "0.17.5"
|
||||
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
||||
oe_ver_: "0.17.2"
|
||||
oe_ver_: "0.17.5"
|
||||
|
||||
# Source install
|
||||
workspace: "/tmp/"
|
||||
|
|
Загрузка…
Ссылка в новой задаче