Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .azure-pipelines-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ pr: none
resources:
containers:
- container: virtual
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

- container: snp
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

- container: sgx
image: ghcr.io/microsoft/ccf/ci/sgx:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/sgx:build-05-12-2024
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:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/deploy_aci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
env:
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
ACR_REGISTRY: ccfmsrc.azurecr.io
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

- script: |
set -ex
Expand Down
2 changes: 1 addition & 1 deletion .azure_pipelines_snp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ schedules:
resources:
containers:
- container: virtual
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bencher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Continuous Benchmarking with Bencher
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
checks:
name: "Format and License Checks"
runs-on: ubuntu-latest
container: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
container: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
options: --user root --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
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
options: ${{ matrix.platform.options }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# Insufficient space to run on public runner, so use custom pool
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
options: --user root

permissions:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/long-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: "Scan build"
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand All @@ -27,7 +27,7 @@ jobs:
name: ASAN
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
name: TSAN
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
cmake_options: -DLVI_MITIGATIONS=ON
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}"
steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tlaplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Model Checking - Consistency
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
name: Model Checking - Consensus
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
name: Model Checking With Reconfig - Consensus
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
name: Trace Validation - Consensus
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
container:
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024

steps:
- uses: actions/checkout@v4
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ 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).

## [5.0.11]

[5.0.11]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.11

### Dependencies

- Updated Open Enclave from 0.19.7 to 0.19.8 (#6685).
- Updated Intel PSW from 2.20.100 to 2.25.100 (#6685).

## [5.0.10]

[5.0.10]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.10
Expand Down
2 changes: 1 addition & 1 deletion cmake/cpack_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1f)")
set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})

set(OE_VERSION "0.19.7")
set(OE_VERSION "0.19.8")
if(COMPILE_TARGET STREQUAL "sgx")
list(APPEND CCF_DEB_DEPENDENCIES
"libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"
Expand Down
2 changes: 1 addition & 1 deletion cmake/open_enclave.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(REQUIRE_OPENENCLAVE)
endif()

# Find OpenEnclave package
find_package(OpenEnclave 0.19.7 CONFIG REQUIRED)
find_package(OpenEnclave 0.19.8 CONFIG REQUIRED)

option(USE_OPENSSL_3 "Use OpenSSL 3.x for Open Enclave builds" ON)
if(USE_OPENSSL_3)
Expand Down
2 changes: 1 addition & 1 deletion docker/ccf_ci_built
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Also contains CCF source and build directory

# Latest image as of this change
ARG base=ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
ARG base=ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
FROM ${base}

# SSH. Note that this could (should) be done in the base ccf_ci image instead
Expand Down
Loading