This is an automated email from the ASF dual-hosted git repository. hsun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 5c914d0b634b7af32649c36394a6e46af89f0b6c Author: sunhe05 <[email protected]> AuthorDate: Sat Mar 18 00:09:40 2023 +0000 [CI] Build with release to reduce output size The github actions runner is running out of the disk space with debug build. --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 4 ++-- cmake/scripts/build_in_ci.sh | 2 +- services/execution/enclave/src/service.rs | 2 +- third_party/rust-sgx-sdk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b548bf7d..c8c57513 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: . /opt/sgxsdk/environment && . /root/.cargo/env && mkdir -p build && cd build && - cmake -DRUSTFLAGS="-D warnings" -DTEST_MODE=ON .. && + cmake -DCMAKE_BUILD_TYPE=Release -DRUSTFLAGS="-D warnings" -DTEST_MODE=ON .. && CLP=1 make -j license: runs-on: ubuntu-20.04 diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ce5623..818de3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,7 +267,7 @@ add_custom_target( default_std COMMAND ${CMAKE_COMMAND} -E env ${TEACLAVE_COMMON_ENVS} RUSTFLAGS="" - cargo build --target-dir ${TRUSTED_TARGET_DIR}/default_std + cargo build ${CARGO_BUILD_FLAGS} --target-dir ${TRUSTED_TARGET_DIR}/default_std --features backtrace,capi,env,net,thread,untrusted_time,unsupported_process -Zbuild-std=core,alloc --target ${RUST_SGX_SDK}/rustlib/${SGX_LIB_TARGET}.json COMMAND @@ -284,7 +284,7 @@ add_custom_target( cov_std COMMAND ${CMAKE_COMMAND} -E env ${TEACLAVE_COMMON_ENVS} RUSTFLAGS="" - cargo build --target-dir ${TRUSTED_TARGET_DIR}/cov_std + cargo build ${CARGO_BUILD_FLAGS} --target-dir ${TRUSTED_TARGET_DIR}/cov_std --features backtrace,capi,env,net,profiler,thread,untrusted_time,unsupported_process -Zbuild-std=core,alloc --target ${RUST_SGX_SDK}/rustlib/${SGX_LIB_TARGET}.json COMMAND diff --git a/cmake/scripts/build_in_ci.sh b/cmake/scripts/build_in_ci.sh index ffcebb44..20084d38 100755 --- a/cmake/scripts/build_in_ci.sh +++ b/cmake/scripts/build_in_ci.sh @@ -30,5 +30,5 @@ git config --global --add safe.directory /__w/incubator-teaclave/incubator-teacl # Build . /opt/sgxsdk/environment && . ~/.cargo/env && \ mkdir -p build && pushd build && \ -cmake -DCMAKE_BUILD_TYPE=Debug -DSGX_SIM_MODE=ON -DTEST_MODE=ON .. && \ +cmake -DCMAKE_BUILD_TYPE=Release -DSGX_SIM_MODE=ON -DTEST_MODE=ON .. && \ VERBOSE=1 make -j && rm -rf target diff --git a/services/execution/enclave/src/service.rs b/services/execution/enclave/src/service.rs index 916b58c7..96d470a5 100644 --- a/services/execution/enclave/src/service.rs +++ b/services/execution/enclave/src/service.rs @@ -89,6 +89,7 @@ impl TeaclaveExecutionService { Ok(task) => { self.status = ExecutorStatus::Executing; self.update_task_status(&task.task_id, TaskStatus::Running)?; + log::info!("Executor {} accepted a new task, executing...", self.id); let tx_task = tx.clone(); let fusion_base = self.fusion_base.clone(); current_task = Arc::new(Some(task)); @@ -99,7 +100,6 @@ impl TeaclaveExecutionService { tx_task.send(result).unwrap(); }); task_handle = Some(handle); - log::info!("Executor {} accepted a new task, executing...", self.id); } Err(e) => { log::error!("Executor {} failed to pull task: {}", self.id, e); diff --git a/third_party/rust-sgx-sdk b/third_party/rust-sgx-sdk index 43105575..ff3543ba 160000 --- a/third_party/rust-sgx-sdk +++ b/third_party/rust-sgx-sdk @@ -1 +1 @@ -Subproject commit 431055754daca647e19df2b778079030ebaa8569 +Subproject commit ff3543ba695c65ac8e623402c8f82b6a736fb100 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
