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-trustzone-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new a6c6516 Fix ci error (#50)
a6c6516 is described below
commit a6c65166ae13820b691cdd246961788a117e9101
Author: Yuan Zhuang <[email protected]>
AuthorDate: Wed Oct 20 01:50:44 2021 +0800
Fix ci error (#50)
---
.github/workflows/ci.yml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3368fff..db2c9bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ defaults:
jobs:
build-and-run-examples:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.1
+ container: teaclave/teaclave-trustzone-sdk-build:0.2.2
steps:
- name: Checkout repository
uses: actions/checkout@v2
@@ -47,7 +47,7 @@ jobs:
cd ci && ./ci.sh
build-utee-teec:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.0
+ container: teaclave/teaclave-trustzone-sdk-build:0.2.2
steps:
- name: Checkout repository
uses: actions/checkout@v2
@@ -68,7 +68,7 @@ jobs:
(cd optee-teec && cargo build --target aarch64-unknown-linux-gnu -vv)
build-and-run-examples-in-OPTEE-repo:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-trustzone-sdk-build:0.2.1
+ container: teaclave/teaclave-trustzone-sdk-build:0.2.2
steps:
- name: Checkout OP-TEE repository
run: |
@@ -78,12 +78,6 @@ jobs:
mkdir optee-qemuv8 && cd optee-qemuv8 &&
repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
repo sync -j4 --no-clone-bundle
- # This step will be removed after merging those commits to upstream:
- - name: Switch to current commits
- run: |
- cd optee-qemuv8
- (cd optee_rust && git fetch github pull/45/head && git checkout
FETCH_HEAD)
- (cd build && git fetch https://github.com/DemesneGH/build.git && git
checkout FETCH_HEAD)
- name: Build images
run: |
cd optee-qemuv8
@@ -93,7 +87,7 @@ jobs:
- name: Test Rust applications
run: |
cd optee-qemuv8
- cd build && make CFG_TEE_CORE_LOG_LEVEL=0 check-rust
+ cd build && make CFG_TEE_CORE_LOG_LEVEL=0 OPTEE_RUST_ENABLE=y
check-rust
license:
runs-on: ubuntu-20.04
steps:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]