You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2021/02/02 00:06:39 UTC
[incubator-teaclave] branch master updated (0bfb500 -> f64d047)
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git.
from 0bfb500 [SDK] Add iOS/macOS build support for protected_fs (#477)
new 7956ff3 Fix SDK building issue on macos
new bfeb55d Enable macos CI job for client SDK
new f64d047 Install Rust using rustup
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yml | 16 ++++++++++++++++
common/protected_fs_rs/build.rs | 2 +-
common/protected_fs_rs/protected_fs_c/build.sh | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 01/03: Fix SDK building issue on macos
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 7956ff38201d6010a6bfb4c1b80273877e65e8bf
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Mon Feb 1 13:57:16 2021 -0800
Fix SDK building issue on macos
---
common/protected_fs_rs/build.rs | 2 +-
common/protected_fs_rs/protected_fs_c/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/protected_fs_rs/build.rs b/common/protected_fs_rs/build.rs
index c391f2d..0520c8a 100644
--- a/common/protected_fs_rs/build.rs
+++ b/common/protected_fs_rs/build.rs
@@ -55,7 +55,7 @@ fn build_non_sgx_protected_fs_c_with_cmake() {
println!("cargo:rustc-link-search=native={}", target_dir.display());
println!("cargo:rustc-link-lib=static=tprotected_fs");
println!("cargo:rustc-link-lib=static=uprotected_fs");
- if target != "aarch64-apple-ios" {
+ if target != "aarch64-apple-ios" && target != "x86_64-apple-darwin" {
println!("cargo:rustc-link-lib=crypto");
println!("cargo:rustc-link-lib=stdc++");
}
diff --git a/common/protected_fs_rs/protected_fs_c/build.sh b/common/protected_fs_rs/protected_fs_c/build.sh
index 2b3a698..ffb0a68 100644
--- a/common/protected_fs_rs/protected_fs_c/build.sh
+++ b/common/protected_fs_rs/protected_fs_c/build.sh
@@ -56,4 +56,4 @@ cd "${BUILD_DIR}"
cmake ${TARGET_FLAGS} ${MODE} ${BUILD_TYPE} "${SOURCE_DIR}"
# We need to force build with -j1 here.
-cmake --build . ${BUILD_TYPE} -- -j1
+MAKEFLAGS=-j1 cmake --build . ${BUILD_TYPE}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 02/03: Enable macos CI job for client SDK
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit bfeb55da8e6a51f3d9f9b7fa49820abf6b397437
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Mon Feb 1 14:43:43 2021 -0800
Enable macos CI job for client SDK
---
.github/workflows/ci.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6eab6e0..235755f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,24 @@ defaults:
shell: bash
jobs:
+ teaclave-client-sdk-macos:
+ runs-on: macos-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install dependencies
+ run: brew install cmake openssl
+ - name: Install latest nightly
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: nightly-2020-04-07
+ target: aarch64-apple-ios
+ override: true
+ components: rustfmt, clippy
+ - name: Building Teaclave Client SDK
+ run: |
+ export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/"
+ cargo build --manifest-path sdk/rust/Cargo.toml
+ cargo build --manifest-path sdk/rust/Cargo.toml --target aarch64-apple-ios
sim-debug-ubuntu-1804:
runs-on: ubuntu-18.04
container: teaclave/teaclave-build-ubuntu-1804-sgx-2.9.1:0.1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 03/03: Install Rust using rustup
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit f64d0471508840a922fc7e69bed41d486330bdf0
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Mon Feb 1 15:09:30 2021 -0800
Install Rust using rustup
---
.github/workflows/ci.yml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 235755f..b45ca07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,17 +10,15 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install dependencies
- run: brew install cmake openssl
- - name: Install latest nightly
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly-2020-04-07
- target: aarch64-apple-ios
- override: true
- components: rustfmt, clippy
+ run: |
+ brew install cmake openssl
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ export PATH=~/.cargo/bin:$PATH
+ rustup default nightly-2020-04-07 && rustup target add aarch64-apple-ios
- name: Building Teaclave Client SDK
run: |
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/libssh2/lib/pkgconfig/"
+ export PATH=~/.cargo/bin:$PATH
cargo build --manifest-path sdk/rust/Cargo.toml
cargo build --manifest-path sdk/rust/Cargo.toml --target aarch64-apple-ios
sim-debug-ubuntu-1804:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org