This commit is contained in:
Amaury Chamayou 2021-05-26 13:16:12 +01:00 коммит произвёл GitHub
Родитель 28b7bfa7b9
Коммит 21dde004f2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 23 добавлений и 12 удалений

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

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

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

@ -27,11 +27,11 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfciteam/ccf-ci:oe0.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
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.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /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.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
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.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
jobs:

2
.github/workflows/ci-checks.yml поставляемый
Просмотреть файл

@ -9,7 +9,7 @@ on:
jobs:
checks:
runs-on: ubuntu-18.04
container: ccfciteam/ccf-ci:oe0.15.0-iptables
container: ccfciteam/ccf-ci:oe0.16.1
steps:
- name: Checkout repository

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

@ -16,7 +16,7 @@ pr:
resources:
containers:
- container: sgx
image: ccfciteam/ccf-ci:oe0.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --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.15.0-iptables
image: ccfciteam/ccf-ci:oe0.16.1
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
jobs:

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

@ -23,6 +23,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Signed requests with a url-encoded query string are now handled correctly rather than rejected (#2592).
- Fixed consistency issue between ledger files on different nodes when snapshotting is active (#2607).
### Dependency
- Upgrade OpenEnclave from 0.15.0 to 0.16.1 (#2609)
## [1.0.3]
### Dependency
- Upgrade OpenEnclave from 0.15.0 to 0.16.1 (#2609)
## [1.0.2]
### Bugfix
@ -882,6 +892,7 @@ Some discrepancies with the TR remain, and are being tracked under https://githu
Initial pre-release
[1.0.3]: https://github.com/microsoft/CCF/releases/tag/ccf-1.0.3
[1.0.2]: https://github.com/microsoft/CCF/releases/tag/ccf-1.0.2
[1.0.1]: https://github.com/microsoft/CCF/releases/tag/ccf-1.0.1
[1.0.0]: https://github.com/microsoft/CCF/releases/tag/ccf-1.0.0

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

@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
endif()
# Find OpenEnclave package
find_package(OpenEnclave 0.15 CONFIG REQUIRED)
find_package(OpenEnclave 0.16.1 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

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

@ -20,7 +20,7 @@ endif()
# CPack variables for Debian packages
set(CPACK_DEBIAN_PACKAGE_DEPENDS
"open-enclave (>=0.15.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
"open-enclave (>=0.16.1), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

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

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