зеркало из https://github.com/microsoft/CCF.git
Update to OpenEnclave 0.15.0~rc1 (#2398)
This commit is contained in:
Родитель
fc59719d20
Коммит
556e125e3e
|
@ -7,7 +7,7 @@ trigger:
|
|||
|
||||
jobs:
|
||||
- job: build_and_publish_docs
|
||||
container: ccfciteam/ccf-ci:oe0.14.0
|
||||
container: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
pool:
|
||||
vmImage: ubuntu-18.04
|
||||
|
||||
|
|
|
@ -25,11 +25,11 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: nosgx
|
||||
image: ccfciteam/ccf-ci:oe0.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
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.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
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.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
|
||||
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -9,7 +9,7 @@ on:
|
|||
jobs:
|
||||
checks:
|
||||
runs-on: ubuntu-18.04
|
||||
container: ccfciteam/ccf-ci:oe0.14.0
|
||||
container: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
|
|
@ -16,7 +16,7 @@ pr:
|
|||
resources:
|
||||
containers:
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -21,7 +21,7 @@ schedules:
|
|||
resources:
|
||||
containers:
|
||||
- container: sgx
|
||||
image: ccfciteam/ccf-ci:oe0.14.0
|
||||
image: ccfciteam/ccf-ci:oe0.15.0-rc1
|
||||
options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
|
||||
|
||||
jobs:
|
||||
|
|
|
@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
|
|||
endif()
|
||||
|
||||
# Find OpenEnclave package
|
||||
find_package(OpenEnclave 0.14 CONFIG REQUIRED)
|
||||
find_package(OpenEnclave 0.15 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.14.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
|
||||
"open-enclave (>=0.15.0~rc1), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
|
||||
)
|
||||
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
oe_ver: "0.14.0"
|
||||
oe_ver: "0.15.0-rc1"
|
||||
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
||||
oe_ver_: "0.14.0"
|
||||
oe_ver_: "0.15.0_rc1"
|
||||
|
||||
# Source install
|
||||
workspace: "/tmp/"
|
||||
|
|
Загрузка…
Ссылка в новой задаче