diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 97766aee7db0..b7477eb501ff 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -11,7 +11,7 @@ jobs: variables: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true - container: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index dec534f38186..94f9dc490ddf 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -48,7 +48,7 @@ jobs: - script: | set -ex docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY - docker pull $ACR_REGISTRY/ccf/ci:2024-05-29-snp-clang15 + docker pull $ACR_REGISTRY/ccf/ci:oe-0.19.6-0-snp-clang15 docker build -f docker/ccf_ci_built . --build-arg="base=$BASE_IMAGE" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` name: build_ci_image @@ -57,7 +57,7 @@ jobs: ACR_TOKEN_NAME: ci-push-token ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD) ACR_REGISTRY: ccfmsrc.azurecr.io - BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15 + BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15 - script: | set -ex diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 148588185df0..52f397038aec 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,15 +29,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15 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:2024-05-29-sgx + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-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: diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml index 8fa7fde7872e..26a283a43120 100644 --- a/.azure_pipelines_snp.yml +++ b/.azure_pipelines_snp.yml @@ -31,7 +31,7 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.daily.yml b/.daily.yml index 4fd76693e9ef..c628fba7a31a 100644 --- a/.daily.yml +++ b/.daily.yml @@ -25,15 +25,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang15 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:2024-05-29-sgx + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-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: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d202791ce2b7..8240bedbff73 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Development Environment", - "image": "ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15", + "image": "ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15", "runArgs": [], "extensions": [ "eamodio.gitlens", diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index a68b98c6056f..c2ceee5cd788 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:2024-05-29-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.github/workflows/tlaplus.yml b/.github/workflows/tlaplus.yml index 8f09577255f1..95f70b93261e 100644 --- a/.github/workflows/tlaplus.yml +++ b/.github/workflows/tlaplus.yml @@ -14,7 +14,7 @@ jobs: name: Model Checking - Consensus runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub] container: - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 steps: - uses: actions/checkout@v3 diff --git a/.multi-thread.yml b/.multi-thread.yml index c31cc033b83e..4bc519dd646a 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.stress.yml b/.stress.yml index 612d323f8d7e..53107381ae1e 100644 --- a/.stress.yml +++ b/.stress.yml @@ -20,7 +20,7 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:2024-05-29-sgx + image: ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c168c6e051d..96db3ad3695c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ 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). +## [4.0.18] + +[4.0.18]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.18 + +### Dependencies + +- Updated Open Enclave to [0.19.6](https://github.com/openenclave/openenclave/releases/tag/v0.19.6). + ## [4.0.17] [4.0.17]: https://github.com/microsoft/CCF/releases/tag/ccf-4.0.17 diff --git a/cmake/cpack_settings.cmake b/cmake/cpack_settings.cmake index 3f9c16d971ae..dbd91628dd82 100644 --- a/cmake/cpack_settings.cmake +++ b/cmake/cpack_settings.cmake @@ -21,7 +21,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}") set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1)") set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES}) -set(OE_VERSION "0.19.3") +set(OE_VERSION "0.19.6") if(COMPILE_TARGET STREQUAL "sgx") list(APPEND CCF_DEB_DEPENDENCIES "libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})" diff --git a/cmake/open_enclave.cmake b/cmake/open_enclave.cmake index 37e99ba97b2d..c3bc5df4feea 100644 --- a/cmake/open_enclave.cmake +++ b/cmake/open_enclave.cmake @@ -6,7 +6,7 @@ if(NOT COMPILE_TARGET STREQUAL "sgx") endif() # Find OpenEnclave package -find_package(OpenEnclave 0.19.3 CONFIG REQUIRED) +find_package(OpenEnclave 0.19.6 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/docker/ccf_ci_built b/docker/ccf_ci_built index 3ec61d922a9f..95dd5807741f 100644 --- a/docker/ccf_ci_built +++ b/docker/ccf_ci_built @@ -4,7 +4,7 @@ # Latest image as of this change ARG platform=sgx -ARG base=ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp-clang-15 +ARG base=ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp-clang-15 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py index 3231ebcdb29d..a1b40e299e0b 100644 --- a/scripts/azure_deployment/arm_aci.py +++ b/scripts/azure_deployment/arm_aci.py @@ -132,7 +132,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace: "--aci-image", help="The name of the image to deploy in the ACI", type=str, - default="ccfmsrc.azurecr.io/ccf/ci:2024-05-29-snp", + default="ccfmsrc.azurecr.io/ccf/ci:oe-0.19.6-0-snp", ) parser.add_argument( "--aci-type",