Skip to content

Commit

Permalink
Fix cargo error (#102)
Browse files Browse the repository at this point in the history
* Update setup.sh

Bump rust toolchain version for fixing cargo error: `error[E0658]: use of unstable library feature 'str_strip': newly added`.

* Update ci.yml

fix error: when building optee_test_ext, `make[2]: execvp: /bin/bash: Argument list too long`
  • Loading branch information
DemesneGH authored Dec 16, 2022
1 parent 3845250 commit 0c7d3a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ jobs:
mkdir -p ~/bin
curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo && chmod a+x ~/bin/repo
export PATH=~/bin:$PATH
mkdir optee-qemuv8 && cd optee-qemuv8 &&
mkdir -p ~/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
- name: Build images and run tests
run: |
cd optee-qemuv8
cd ~/optee-qemuv8
rm -rf optee_rust/ &&
mv $GITHUB_WORKSPACE/incubator-teaclave-trustzone-sdk optee_rust/
export OPTEE_DIR=$(pwd)
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ source $HOME/.cargo/env
rustup component add rust-src && rustup target install aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf

# install Xargo
rustup default 1.44.0 && cargo +1.44.0 install xargo
rustup default 1.56.0 && cargo +1.56.0 install xargo
# switch to nightly
rustup default nightly-2021-09-20

Expand Down

0 comments on commit 0c7d3a6

Please sign in to comment.