Skip to content

Commit fa0ab62

Browse files
achamayouachamayou
authored
Update to 05-12-2024 build image (#6690)
1 parent c5bd5b8 commit fa0ab62

13 files changed

+29
-20
lines changed

‎.azure-pipelines-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ pr: none
88
resources:
99
containers:
1010
- container: virtual
11-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
11+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
1212
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
1313

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

1818
- container: sgx
19-
image: ghcr.io/microsoft/ccf/ci/sgx:build-25-07-2024
19+
image: ghcr.io/microsoft/ccf/ci/sgx:build-05-12-2024
2020
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
2121

2222
variables:

‎.azure-pipelines-templates/deploy_aci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
5252
ACR_REGISTRY: ccfmsrc.azurecr.io
53-
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
53+
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
5454
5555
- script: |
5656
set -ex

‎.azure_pipelines_snp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ schedules:
2222
resources:
2323
containers:
2424
- container: virtual
25-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
25+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
2626
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
2727

2828
jobs:

‎.github/workflows/bencher.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Continuous Benchmarking with Bencher
1212
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1313
container:
14-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
14+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
checks:
2121
name: "Format and License Checks"
2222
runs-on: ubuntu-latest
23-
container: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
23+
container: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
2424

2525
steps:
2626
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -48,7 +48,7 @@ jobs:
4848
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
4949
runs-on: ${{ matrix.platform.nodes }}
5050
container:
51-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
51+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
5252
options: ${{ matrix.platform.options }}
5353
steps:
5454
- uses: actions/checkout@v4

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Insufficient space to run on public runner, so use custom pool
2626
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2727
container:
28-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
28+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
2929
options: --user root
3030

3131
permissions:

‎.github/workflows/long-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: "Scan build"
1111
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1212
container:
13-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
13+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
1414

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

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

7474
steps:
7575
- uses: actions/checkout@v4

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
cmake_options: -DLVI_MITIGATIONS=ON
8181
runs-on: ${{ matrix.platform.nodes }}
8282
container:
83-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
83+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-05-12-2024
8484
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 }}"
8585
steps:
8686
- uses: actions/checkout@v4

‎.github/workflows/tlaplus.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: Model Checking - Consistency
2424
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2525
container:
26-
image: ghcr.io/microsoft/ccf/ci/default:build-25-07-2024
26+
image: ghcr.io/microsoft/ccf/ci/default:build-05-12-2024
2727

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

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

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

214214
steps:
215215
- uses: actions/checkout@v4

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [5.0.11]
9+
10+
[5.0.11]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.11
11+
12+
### Dependencies
13+
14+
- Updated Open Enclave from 0.19.7 to 0.19.8 (#6685).
15+
- Updated Intel PSW from 2.20.100 to 2.25.100 (#6685).
16+
817
## [5.0.10]
918

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

‎cmake/cpack_settings.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
2424
set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1f)")
2525
set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
2626

27-
set(OE_VERSION "0.19.7")
27+
set(OE_VERSION "0.19.8")
2828
if(COMPILE_TARGET STREQUAL "sgx")
2929
list(APPEND CCF_DEB_DEPENDENCIES
3030
"libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"

‎cmake/open_enclave.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(REQUIRE_OPENENCLAVE)
1313
endif()
1414

1515
# Find OpenEnclave package
16-
find_package(OpenEnclave 0.19.7 CONFIG REQUIRED)
16+
find_package(OpenEnclave 0.19.8 CONFIG REQUIRED)
1717

1818
option(USE_OPENSSL_3 "Use OpenSSL 3.x for Open Enclave builds" ON)
1919
if(USE_OPENSSL_3)

‎docker/ccf_ci_built

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Also contains CCF source and build directory
44

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

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

0 commit comments

Comments
 (0)