Skip to content

Commit c3ec48d

Browse files
committed
fix: ci
1 parent a1dd976 commit c3ec48d

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

.github/workflows/sgx-world.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ jobs:
1414
runs-on:
1515
- ubuntu-18.04
1616
image:
17-
- "baiduxlab/sgx-rust:1604-1.1.3"
18-
- "baiduxlab/sgx-rust:1804-1.1.3"
19-
- "baiduxlab/sgx-rust:2004-1.1.3"
20-
- "baiduxlab/sgx-rust:fedora31-1.1.3"
21-
- "baiduxlab/sgx-rust:centos8-1.1.3"
17+
- "baiduxlab/sgx-rust:1804-1.1.4"
18+
- "baiduxlab/sgx-rust:2004-1.1.4"
19+
- "baiduxlab/sgx-rust:centos8-1.1.4"
2220
build-command:
23-
- "cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx"
24-
- "cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx --release"
21+
- "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cp ../../.github/workflows/Xargo.toml . && RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-unknown-linux-sgx"
22+
- "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"
2523
- "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cargo build"
2624
- "cat ../../.github/workflows/patch.txt >> ./Cargo.toml && cargo build --release"
2725
runs-on: ${{ matrix.runs-on }}
@@ -56,7 +54,7 @@ jobs:
5654
cargo-audit:
5755
runs-on: ubuntu-18.04
5856
container:
59-
image: "baiduxlab/sgx-rust:1804-1.1.3"
57+
image: "baiduxlab/sgx-rust:1804-1.1.4"
6058
steps:
6159
- uses: actions/checkout@v1
6260
with:
@@ -80,4 +78,4 @@ jobs:
8078
cargo install cargo-audit &&
8179
git clone https://github.com/dingelish/sgx-world &&
8280
cd sgx-world/dumb-all &&
83-
cargo audit --ignore RUSTSEC-2016-0005 --ignore RUSTSEC-2020-0023
81+
cargo audit --ignore RUSTSEC-2016-0005 --ignore RUSTSEC-2020-0023 --ignore RUSTSEC-2020-0159 --ignore RUSTSEC-2021-0076 --ignore RUSTSEC-2021-0073

.github/workflows/sim-example.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ jobs:
1414
runs-on:
1515
- ubuntu-18.04
1616
image:
17-
- "baiduxlab/sgx-rust:1604-1.1.3"
18-
- "baiduxlab/sgx-rust:1804-1.1.3"
19-
- "baiduxlab/sgx-rust:2004-1.1.3"
20-
- "baiduxlab/sgx-rust:fedora31-1.1.3"
21-
- "baiduxlab/sgx-rust:centos8-1.1.3"
17+
- "baiduxlab/sgx-rust:1804-1.1.4"
18+
- "baiduxlab/sgx-rust:2004-1.1.4"
19+
- "baiduxlab/sgx-rust:centos8-1.1.4"
2220
single-sample:
2321
- "backtrace"
2422
- "crypto"
@@ -80,11 +78,9 @@ jobs:
8078
runs-on:
8179
- ubuntu-18.04
8280
image:
83-
- "baiduxlab/sgx-rust:1604-1.1.3"
84-
- "baiduxlab/sgx-rust:1804-1.1.3"
85-
- "baiduxlab/sgx-rust:2004-1.1.3"
86-
- "baiduxlab/sgx-rust:fedora31-1.1.3"
87-
- "baiduxlab/sgx-rust:centos8-1.1.3"
81+
- "baiduxlab/sgx-rust:1804-1.1.4"
82+
- "baiduxlab/sgx-rust:2004-1.1.4"
83+
- "baiduxlab/sgx-rust:centos8-1.1.4"
8884
runs-on: ${{ matrix.runs-on }}
8985
container:
9086
image: ${{ matrix.image }}
@@ -148,11 +144,9 @@ jobs:
148144
runs-on:
149145
- ubuntu-18.04
150146
image:
151-
- "baiduxlab/sgx-rust:1604-1.1.3"
152-
- "baiduxlab/sgx-rust:1804-1.1.3"
153-
- "baiduxlab/sgx-rust:2004-1.1.3"
154-
- "baiduxlab/sgx-rust:fedora31-1.1.3"
155-
- "baiduxlab/sgx-rust:centos8-1.1.3"
147+
- "baiduxlab/sgx-rust:1804-1.1.4"
148+
- "baiduxlab/sgx-rust:2004-1.1.4"
149+
- "baiduxlab/sgx-rust:centos8-1.1.4"
156150
runs-on: ${{ matrix.runs-on }}
157151
container:
158152
image: ${{ matrix.image }}

samplecode/wasmi/app/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ serde_json = {version = "1.0"}
1313
serde_derive = {version = "1.0"}
1414
nan-preserving-float = "0.1.0"
1515

16+
[build-dependencies]
17+
cmake = "=0.1.42"
18+
1619
[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
1720
sgx_types = { path = "../../../sgx_types" }
1821
sgx_urts = { path = "../../../sgx_urts" }

0 commit comments

Comments
 (0)