fix: ci
diff --git a/.github/workflows/sgx-world.yml b/.github/workflows/sgx-world.yml
index f509a3a..3c202c2 100644
--- a/.github/workflows/sgx-world.yml
+++ b/.github/workflows/sgx-world.yml
@@ -14,14 +14,12 @@
runs-on:
- ubuntu-18.04
image:
- - "baiduxlab/sgx-rust:1604-1.1.3"
- - "baiduxlab/sgx-rust:1804-1.1.3"
- - "baiduxlab/sgx-rust:2004-1.1.3"
- - "baiduxlab/sgx-rust:fedora31-1.1.3"
- - "baiduxlab/sgx-rust:centos8-1.1.3"
+ - "baiduxlab/sgx-rust:1804-1.1.4"
+ - "baiduxlab/sgx-rust:2004-1.1.4"
+ - "baiduxlab/sgx-rust:centos8-1.1.4"
build-command:
- - "cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx"
- - "cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx --release"
+ - "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx"
+ - "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx --release"
- "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cargo build"
- "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cargo build --release"
runs-on: ${{ matrix.runs-on }}
@@ -56,7 +54,7 @@
cargo-audit:
runs-on: ubuntu-18.04
container:
- image: "baiduxlab/sgx-rust:1804-1.1.3"
+ image: "baiduxlab/sgx-rust:1804-1.1.4"
steps:
- uses: actions/checkout@v1
with:
@@ -80,4 +78,4 @@
cargo install cargo-audit &&
git clone https://github.com/dingelish/sgx-world &&
cd sgx-world/dumb-all &&
- cargo audit --ignore RUSTSEC-2016-0005 --ignore RUSTSEC-2020-0023
+ cargo audit --ignore RUSTSEC-2016-0005 --ignore RUSTSEC-2020-0023 --ignore RUSTSEC-2020-0159 --ignore RUSTSEC-2021-0076 --ignore RUSTSEC-2021-0073
diff --git a/.github/workflows/sim-example.yml b/.github/workflows/sim-example.yml
index 29f9a6d..e6d5685 100644
--- a/.github/workflows/sim-example.yml
+++ b/.github/workflows/sim-example.yml
@@ -14,11 +14,9 @@
runs-on:
- ubuntu-18.04
image:
- - "baiduxlab/sgx-rust:1604-1.1.3"
- - "baiduxlab/sgx-rust:1804-1.1.3"
- - "baiduxlab/sgx-rust:2004-1.1.3"
- - "baiduxlab/sgx-rust:fedora31-1.1.3"
- - "baiduxlab/sgx-rust:centos8-1.1.3"
+ - "baiduxlab/sgx-rust:1804-1.1.4"
+ - "baiduxlab/sgx-rust:2004-1.1.4"
+ - "baiduxlab/sgx-rust:centos8-1.1.4"
single-sample:
- "backtrace"
- "crypto"
@@ -80,11 +78,9 @@
runs-on:
- ubuntu-18.04
image:
- - "baiduxlab/sgx-rust:1604-1.1.3"
- - "baiduxlab/sgx-rust:1804-1.1.3"
- - "baiduxlab/sgx-rust:2004-1.1.3"
- - "baiduxlab/sgx-rust:fedora31-1.1.3"
- - "baiduxlab/sgx-rust:centos8-1.1.3"
+ - "baiduxlab/sgx-rust:1804-1.1.4"
+ - "baiduxlab/sgx-rust:2004-1.1.4"
+ - "baiduxlab/sgx-rust:centos8-1.1.4"
runs-on: ${{ matrix.runs-on }}
container:
image: ${{ matrix.image }}
@@ -148,11 +144,9 @@
runs-on:
- ubuntu-18.04
image:
- - "baiduxlab/sgx-rust:1604-1.1.3"
- - "baiduxlab/sgx-rust:1804-1.1.3"
- - "baiduxlab/sgx-rust:2004-1.1.3"
- - "baiduxlab/sgx-rust:fedora31-1.1.3"
- - "baiduxlab/sgx-rust:centos8-1.1.3"
+ - "baiduxlab/sgx-rust:1804-1.1.4"
+ - "baiduxlab/sgx-rust:2004-1.1.4"
+ - "baiduxlab/sgx-rust:centos8-1.1.4"
runs-on: ${{ matrix.runs-on }}
container:
image: ${{ matrix.image }}
diff --git a/samplecode/wasmi/app/Cargo.toml b/samplecode/wasmi/app/Cargo.toml
index f85bca0..5a1cfbc 100644
--- a/samplecode/wasmi/app/Cargo.toml
+++ b/samplecode/wasmi/app/Cargo.toml
@@ -13,6 +13,9 @@
serde_derive = {version = "1.0"}
nan-preserving-float = "0.1.0"
+[build-dependencies]
+cmake = "=0.1.42"
+
[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_types = { path = "../../../sgx_types" }
sgx_urts = { path = "../../../sgx_urts" }