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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Open Enclave 0.18.1 #4023

Merged
merged 3 commits into from
Jul 12, 2022
Merged

Upgrade to Open Enclave 0.18.1 #4023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087999c
.
achamayou Jul 11, 2022
31e0683
changelog
achamayou Jul 11, 2022
96770d2
Merge branch 'main' into upgrade_to_oe_0.18.1
achamayou Jul 11, 2022
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 .azure-pipelines-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ trigger:

jobs:
- job: build_and_publish_docs
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0
pool:
vmImage: ubuntu-20.04

Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-quictls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parameters:

jobs:
- job: build_quictls
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0
pool: 1es-dv4-focal

strategy:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-v8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:

jobs:
- job: build_v8
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0
pool: 1es-dv4-focal

strategy:
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-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

- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-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

variables:
Expand Down
4 changes: 2 additions & 2 deletions .daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache

- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-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

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Sample Development Environment for CCF",
"context": "..",
"image": "ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0",
"image": "ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0",
"runArgs": [],
"extensions": ["ms-vscode.cpptools", "ms-python.python"]
}
2 changes: 1 addition & 1 deletion .github/workflows/ci-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
checks:
runs-on: ubuntu-latest
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-0

steps:
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down
2 changes: 1 addition & 1 deletion .multi-thread.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr:
resources:
containers:
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-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

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .stress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ schedules:
resources:
containers:
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.0-0
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.1-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

jobs:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- The "Node Output" page has been relabelled as "Troubleshooting" in the documentation and CLI commands for troubleshooting have been added to it.

### Dependencies

- Upgraded Open Enclave to 0.18.1 (#4023).

## [3.0.0-dev0]

### Added
Expand Down
2 changes: 1 addition & 1 deletion cmake/cpack_settings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif()

# CPack variables for Debian packages
set(CPACK_DEBIAN_PACKAGE_DEPENDS
"open-enclave (>=0.18.0), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
"open-enclave (>=0.18.1), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

Expand Down