зеркало из https://github.com/microsoft/CCF.git
Upgrade Open Enclave to 0.17.6 (#3509)
This commit is contained in:
Родитель
7c6a2b3bbe
Коммит
9c4ef0e890
|
@ -7,7 +7,7 @@ trigger:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: build_and_publish_docs
|
- job: build_and_publish_docs
|
||||||
container: ccfciteam/ccf-ci:oe0.17.5-2
|
container: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
pool:
|
pool:
|
||||||
vmImage: ubuntu-20.04
|
vmImage: ubuntu-20.04
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ parameters:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: build_v8
|
- job: build_v8
|
||||||
container: ccfciteam/ccf-ci:oe0.17.5-2
|
container: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
pool: 1es-dv4-focal
|
pool: 1es-dv4-focal
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
|
|
|
@ -27,11 +27,11 @@ schedules:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: nosgx
|
- container: nosgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.5-2
|
image: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
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
|
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
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.5-2
|
image: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
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
|
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:
|
variables:
|
||||||
|
|
|
@ -9,7 +9,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
checks:
|
checks:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container: ccfciteam/ccf-ci:oe0.17.5-2
|
container: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|
|
@ -16,7 +16,7 @@ pr:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.5-2
|
image: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
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
|
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:
|
jobs:
|
||||||
|
|
|
@ -21,7 +21,7 @@ schedules:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: sgx
|
- container: sgx
|
||||||
image: ccfciteam/ccf-ci:oe0.17.5-2
|
image: ccfciteam/ccf-ci:oe-0.17.6-0
|
||||||
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
|
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:
|
jobs:
|
||||||
|
|
|
@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||||
|
|
||||||
- Add request details with additional URL components to JS + TS API: `request.url`, `request.route`, `request.method`, `request.hostname` (#3498).
|
- Add request details with additional URL components to JS + TS API: `request.url`, `request.route`, `request.method`, `request.hostname` (#3498).
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
- Upgraded Open Enclave to 0.17.6.
|
||||||
|
|
||||||
## [2.0.0-rc0]
|
## [2.0.0-rc0]
|
||||||
|
|
||||||
See [documentation for code upgrade 1.x to 2.0](https://microsoft.github.io/CCF/main/operations/code_upgrade_1x.html) to upgrade an existing 1.x CCF service to 2.0
|
See [documentation for code upgrade 1.x to 2.0](https://microsoft.github.io/CCF/main/operations/code_upgrade_1x.html) to upgrade an existing 1.x CCF service to 2.0
|
||||||
|
|
|
@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Find OpenEnclave package
|
# Find OpenEnclave package
|
||||||
find_package(OpenEnclave 0.17.5 CONFIG REQUIRED)
|
find_package(OpenEnclave 0.17.6 CONFIG REQUIRED)
|
||||||
# As well as pulling in openenclave:: targets, this sets variables which can be
|
# 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
|
# used for our edge cases (eg - for virtual libraries). These do not follow the
|
||||||
# standard naming patterns, for example use OE_INCLUDEDIR rather than
|
# standard naming patterns, for example use OE_INCLUDEDIR rather than
|
||||||
|
|
|
@ -19,7 +19,7 @@ endif()
|
||||||
|
|
||||||
# CPack variables for Debian packages
|
# CPack variables for Debian packages
|
||||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS
|
set(CPACK_DEBIAN_PACKAGE_DEPENDS
|
||||||
"open-enclave (>=0.17.5), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
|
"open-enclave (>=0.17.6), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
|
||||||
)
|
)
|
||||||
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
|
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
oe_ver: "0.17.5"
|
oe_ver: "0.17.6"
|
||||||
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
# Usually the same, except for rc, where ver is -rc and ver_ is _rc
|
||||||
oe_ver_: "0.17.5"
|
oe_ver_: "0.17.6"
|
||||||
|
|
||||||
# Source install
|
# Source install
|
||||||
workspace: "/tmp/"
|
workspace: "/tmp/"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче