diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 2dc4c8e55..2f4db5cfb 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -7,7 +7,7 @@ trigger: jobs: - job: build_and_publish_docs - container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0 + container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-quictls.yml b/.azure-pipelines-quictls.yml index 3fca3d9c1..065b230fa 100644 --- a/.azure-pipelines-quictls.yml +++ b/.azure-pipelines-quictls.yml @@ -17,7 +17,7 @@ parameters: jobs: - job: build_quictls - container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0 + container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx pool: 1es-dv4-focal strategy: diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d602b35ab..6b24a7276 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -27,12 +27,12 @@ schedules: resources: containers: - container: nosgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-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 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx + options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-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 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx + 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 /lib/modules:/lib/modules:ro variables: ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/ccf-') }}: diff --git a/.daily.yml b/.daily.yml index 64b03915f..6f4c1c0a7 100644 --- a/.daily.yml +++ b/.daily.yml @@ -23,12 +23,12 @@ schedules: resources: containers: - container: nosgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0 - options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx + options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-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 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx + 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 jobs: - template: .azure-pipelines-templates/daily-matrix.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c2b66e62e..92ec15e0f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,6 @@ { - "name": "Sample Development Environment for CCF", - "context": "..", - "image": "ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0", + "name": "CCF Development Environment", + "image": "ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx", "runArgs": [], "extensions": ["ms-vscode.cpptools", "ms-python.python"] } diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 9f8167d2a..a3765dcd6 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -9,7 +9,7 @@ on: jobs: checks: runs-on: ubuntu-latest - container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0 + container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.multi-thread.yml b/.multi-thread.yml index 337d0d8e4..ae4a825c1 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx 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: diff --git a/.stress.yml b/.stress.yml index fcd8a09f2..8690071e2 100644 --- a/.stress.yml +++ b/.stress.yml @@ -21,8 +21,8 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-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 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx + 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 jobs: - template: .azure-pipelines-templates/stress-matrix.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 628735d12..c7856754a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.9] + +### Dependencies + +- Upgraded OpenEnclave to 0.18.4. + ## [2.0.8] ### Fixed @@ -1583,6 +1589,7 @@ Some discrepancies with the TR remain, and are being tracked under https://githu Initial pre-release +[2.0.9]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.9 [2.0.8]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.8 [2.0.7]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.7 [2.0.6]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.6 @@ -1674,6 +1681,3 @@ Initial pre-release [0.5]: https://github.com/microsoft/CCF/releases/tag/v0.5 [0.4]: https://github.com/microsoft/CCF/releases/tag/v0.4 [0.3]: https://github.com/microsoft/CCF/releases/tag/v0.3 -[2.0.0-rc8]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.0-rc8 -[unreleased]: https://github.com/microsoft/CCF/releases/tag/ccf-Unreleased -[3.0.0-dev4]: https://github.com/microsoft/CCF/releases/tag/ccf-3.0.0-dev4 diff --git a/cmake/ccf_app.cmake b/cmake/ccf_app.cmake index 61af15d79..21f86e8a7 100644 --- a/cmake/ccf_app.cmake +++ b/cmake/ccf_app.cmake @@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET})) endif() # Find OpenEnclave package -find_package(OpenEnclave 0.18.2 CONFIG REQUIRED) +find_package(OpenEnclave 0.18.4 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 diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake index 32870d218..0449970bf 100644 --- a/cmake/cpack_settings.cmake +++ b/cmake/cpack_settings.cmake @@ -19,7 +19,7 @@ endif() # CPack variables for Debian packages set(CPACK_DEBIAN_PACKAGE_DEPENDS - "open-enclave (>=0.18.2), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)" + "open-enclave (>=0.18.4), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)" ) set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)