From 0c7d3a6660e156f7618e2b317f8ab18d6d049548 Mon Sep 17 00:00:00 2001
From: Yuan Zhuang <demesne@foxmail.com>
Date: Fri, 16 Dec 2022 16:07:45 +0800
Subject: [PATCH] Fix cargo error (#102)

* 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`
---
 .github/workflows/ci.yml | 4 ++--
 setup.sh                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 859e6a7c..6af711fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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)
diff --git a/setup.sh b/setup.sh
index 0028b1e4..9e9c1c8d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -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