From 9ffc85a120766404b36d73c2634d8627dff6c8b1 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Thu, 5 May 2022 13:53:37 +0000 Subject: [PATCH 1/3] Upgrade Open Enclave to 0.17.7 --- .azure-pipelines-gh-pages.yml | 2 +- .azure-pipelines-v8.yml | 2 +- .azure-pipelines.yml | 4 ++-- .daily.yml | 4 ++-- .github/workflows/ci-checks.yml | 2 +- .multi-thread.yml | 2 +- .stress.yml | 2 +- CHANGELOG.md | 4 ++++ 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index fd4517aff14e..6de120cb8531 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -7,7 +7,7 @@ trigger: jobs: - job: build_and_publish_docs - container: ccfciteam/ccf-ci:oe-0.17.6-0-graphviz + container: ccfciteam/ccf-ci:oe-0.17.7-0 pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-v8.yml b/.azure-pipelines-v8.yml index c92c917636b6..59156355b4c3 100644 --- a/.azure-pipelines-v8.yml +++ b/.azure-pipelines-v8.yml @@ -20,7 +20,7 @@ parameters: jobs: - job: build_v8 - container: ccfciteam/ccf-ci:oe-0.17.6-0 + container: ccfciteam/ccf-ci:oe-0.17.7-0 pool: 1es-dv4-focal strategy: diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index dbb25b146ac4..5e3973e2f8a9 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -27,11 +27,11 @@ schedules: resources: containers: - container: nosgx - image: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-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: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-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: diff --git a/.daily.yml b/.daily.yml index 66a9ede5f2c1..49efb86901c3 100644 --- a/.daily.yml +++ b/.daily.yml @@ -23,11 +23,11 @@ schedules: resources: containers: - container: nosgx - image: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-0 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache - container: sgx - image: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-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: diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index dcbf840d7ad3..76d31c65aa48 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -9,7 +9,7 @@ on: jobs: checks: runs-on: ubuntu-20.04 - container: ccfciteam/ccf-ci:oe-0.17.6-0 + container: ccfciteam/ccf-ci:oe-0.17.7-0 steps: - name: Checkout repository diff --git a/.multi-thread.yml b/.multi-thread.yml index 5695416bb7ec..14f28a3ff31f 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: sgx - image: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-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: diff --git a/.stress.yml b/.stress.yml index ee3d381af3ed..581ef41e80c6 100644 --- a/.stress.yml +++ b/.stress.yml @@ -21,7 +21,7 @@ schedules: resources: containers: - container: sgx - image: ccfciteam/ccf-ci:oe-0.17.6-0 + image: ccfciteam/ccf-ci:oe-0.17.7-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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 58293b233868..66fe5583a2e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where new node started without a snapshot would be able to join from a node that started with a snapshot (#3573). - Fixed consensus issue where a node would grant its vote even though it already knew about the current primary (#3810). +### Changes + +- Upgraded Open Enclave to 0.17.7 + ## [2.0.0-rc8] ### Fixed From b00ee6886af807651e69e67336c4b2b54abd793d Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Thu, 5 May 2022 14:04:45 +0000 Subject: [PATCH 2/3] Most annoying --- .github/workflows/ci-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 76d31c65aa48..38568acd887b 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -8,7 +8,7 @@ on: jobs: checks: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ccfciteam/ccf-ci:oe-0.17.7-0 steps: From b00ad8f7af3b61e42f23ba208c38f1be791bc1b9 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Thu, 5 May 2022 15:00:34 +0000 Subject: [PATCH 3/3] I give up --- .github/workflows/ci-checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 38568acd887b..d6a7ff165da5 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -12,6 +12,8 @@ jobs: container: ccfciteam/ccf-ci:oe-0.17.7-0 steps: + - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" + - name: Checkout repository uses: actions/checkout@v3