Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to CCF 5.0.7 #228

Merged
merged 2 commits into from
Oct 18, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.6
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.7

# Dependency of the virtual build of attested-fetch.
RUN apt-get update && apt-get install -y libcurl4-openssl-dev
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
checks:
name: Format and License Checks
runs-on: ubuntu-20.04
container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.6
container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.7
steps:
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout repository
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
unit_tests_enabled: OFF
runs-on: ${{ matrix.platform.nodes }}
container:
image: ghcr.io/microsoft/ccf/app/dev/${{ matrix.platform.image }}:ccf-5.0.6
image: ghcr.io/microsoft/ccf/app/dev/${{ matrix.platform.image }}:ccf-5.0.7
options: ${{ matrix.platform.options }}
env:
# Helps to distinguish between CI and local builds.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Analyze

runs-on: ubuntu-latest
container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.6
container: ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.7

permissions:
actions: read
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: CCF_VERSION
displayName: Target CCF version to build for
type: string
default: 5.0.6
default: 5.0.7

variables:
SCITT_CI: 1 # used in scitt builds and tests
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ 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).

## [0.10.1]

### Changes
* Upgrade to CCF 5.0.7 (#228)

## [0.10.0]

### Changes
* Upgrade to CCF 5.0.6 (#223)
* Add AMD SEV-SNP platform support (#224)
* Add CI pipeline stages for the SNP platform (#225)

## [0.9.0]

### Changes
Expand Down
8 changes: 4 additions & 4 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ It is expected that you have Ubuntu 20.04. Follow the steps below to setup your

2. Install dependencies:
```sh
wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-5.0.6.tar.gz
tar xvzf ccf-5.0.6.tar.gz
cd CCF-ccf-5.0.6/getting_started/setup_vm/
./run.sh app-dev.yml -e ccf_ver=5.0.6 -e platform=<sgx|virtual|snp> -e clang_version=<11|15>
wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-5.0.7.tar.gz
tar xvzf ccf-5.0.7.tar.gz
cd CCF-ccf-5.0.7/getting_started/setup_vm/
./run.sh app-dev.yml -e ccf_ver=5.0.7 -e platform=<sgx|virtual|snp> -e clang_version=<11|15>
```

## Compiling
Expand Down
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(DID_WEB_RESOLVER_SCRIPT "/tmp/scitt/fetch-did-web-doc.py" CACHE STRING "Path
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)


find_package(ccf_${COMPILE_TARGET} 5.0.6 REQUIRED)
find_package(ccf_${COMPILE_TARGET} 5.0.7 REQUIRED)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/target_link_system_libraries.cmake)
Expand Down
2 changes: 1 addition & 1 deletion docker/enclave.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG CCF_VERSION=5.0.6
ARG CCF_VERSION=5.0.7
FROM ghcr.io/microsoft/ccf/app/dev/sgx:ccf-${CCF_VERSION} as builder
ARG CCF_VERSION
ARG SCITT_VERSION_OVERRIDE
Expand Down
2 changes: 1 addition & 1 deletion docker/snp.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG CCF_VERSION=5.0.6
ARG CCF_VERSION=5.0.7
FROM ghcr.io/microsoft/ccf/app/dev/snp:ccf-${CCF_VERSION} as builder
ARG CCF_VERSION
ARG SCITT_VERSION_OVERRIDE
Expand Down
2 changes: 1 addition & 1 deletion docker/virtual.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG CCF_VERSION=5.0.6
ARG CCF_VERSION=5.0.7
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-${CCF_VERSION} as builder
ARG CCF_VERSION
ARG SCITT_VERSION_OVERRIDE
Expand Down
4 changes: 2 additions & 2 deletions docs/reproducibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ To reproduce the same measurement do a docker build locally using the expected b

```
$ cat docker/enclave.Dockerfile | grep CCF_VERSION=
ARG CCF_VERSION=5.0.6
ARG CCF_VERSION=5.0.7
```

- Run a build inside of the CCF docker image and make sure to use a specific path (`__w/1/s`) to the sources as this is where our Azure build server copies the sources before building. If the build was done somewhere else, make sure to obtain the required path value:

```sh
$ export CCF_VERSION="5.0.6"
$ export CCF_VERSION="5.0.7"
$ docker run -it --rm \
-w /__w/1/s -v $(pwd):/__w/1/s \
-v /var/run/docker.sock:/var/run/docker.sock \
Expand Down
2 changes: 1 addition & 1 deletion pyscitt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
python_requires=">=3.8",
install_requires=[
"ccf==5.0.6",
"ccf==5.0.7",
"cryptography==43.*", # needs to match ccf
"httpx",
"cbor2==5.4.*",
Expand Down
2 changes: 1 addition & 1 deletion test/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ httpx
pytest
loguru
aiotools
ccf==5.0.6
ccf==5.0.7
cryptography==43.*
Loading