@@ -85,13 +85,14 @@ jobs:
8585 zlib1g-dev
8686 - name : Run test suite
8787 run : |
88- git clone https://github.com/nervosnetwork/ckb-vm-test-suite
89- ln -snf .. ckb-vm-test-suite/ckb-vm
88+ git clone https://github.com/nervosnetwork/ckb-vm-contrib --recursive
89+ cd ckb-vm-contrib
90+ git checkout 51ece04
91+ cd ..
92+ ln -snf ../.. ckb-vm-contrib/ckb-vm-test-suite/ckb-vm
9093 docker run --rm -v `pwd`:/code nervos/ckb-riscv-gnu-toolchain:bionic-20210804 cp -r /riscv /code/riscv
91- cd ckb-vm-test-suite
92- git checkout 2be7dcb0fda7ab41932813632fd1904e8cecf1f0
93- git submodule update --init --recursive
94- RISCV=`pwd`/../riscv ./test.sh
94+ cd ckb-vm-contrib/ckb-vm-test-suite
95+ RISCV=`pwd`/../../riscv ./test.sh
9596
9697 linux-native-test-spawn :
9798 strategy :
@@ -157,24 +158,22 @@ jobs:
157158 rustup target add aarch64-unknown-linux-gnu
158159 - name : Build test suite
159160 run : |
160- git clone https://github.com/nervosnetwork/ckb-vm-test-suite
161- ln -snf .. ckb-vm-test-suite/ckb-vm
162- docker run --rm -v `pwd`:/code nervos/ckb-riscv-gnu-toolchain:bionic-20210804 cp -r /riscv /code/riscv
163- cd ckb-vm-test-suite
164- git checkout 2be7dcb0fda7ab41932813632fd1904e8cecf1f0
165- git submodule update --init --recursive
166- RISCV=`pwd`/../riscv ./test.sh --build-only
161+ git clone https://github.com/nervosnetwork/ckb-vm-contrib --recursive
162+ cd ckb-vm-contrib
163+ git checkout 51ece04
167164 cd ..
165+ ln -snf ../.. ckb-vm-contrib/ckb-vm-test-suite/ckb-vm
166+ docker run --rm -v `pwd`:/code nervos/ckb-riscv-gnu-toolchain:bionic-20210804 cp -r /riscv /code/riscv
167+ cd ckb-vm-contrib/ckb-vm-test-suite
168+ RISCV=`pwd`/../../riscv ./test.sh --build-only
168169 - name : Run test suite
169170 run : |
170171 sudo apt install -y qemu-system binfmt-support qemu-user-static
171172 sudo apt install -y gcc-multilib
172173 sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu clang
173174 docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
174- cd ckb-vm-test-suite
175- cd binary && cargo build --release --target=aarch64-unknown-linux-gnu && cd ..
176- cd ..
177- docker run --rm -v `pwd`:/code -t --platform linux/arm64 arm64v8/rust bash -c "RISCV=/dummy /code/ckb-vm-test-suite/test.sh --prebuilt-prefix aarch64-unknown-linux-gnu"
175+ cargo build --release --target=aarch64-unknown-linux-gnu --example=ckb_vm_runner --features=asm --config target.aarch64-unknown-linux-gnu.linker=\"aarch64-linux-gnu-gcc\"
176+ docker run --rm -v `pwd`:/code -t --platform linux/arm64 arm64v8/rust bash -c "RISCV=/dummy /code/ckb-vm-contrib/ckb-vm-test-suite/test.sh --prebuilt-prefix aarch64-unknown-linux-gnu"
178177
179178 macos-x86-ci-asm :
180179 runs-on : macos-latest
0 commit comments