diff --git a/.shippable.yml b/.shippable.yml index 993689971fbf..af86a90bdbdf 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -11,6 +11,8 @@ env: - ZEPHYR_TOOLCHAIN_VARIANT=zephyr - MATRIX_BUILDS="5" - MATRIX_BUILDS_EXTRA="5" + - BSIM_OUT_PATH=/opt/bsim/ + - BSIM_COMPONENTS_PATH=${BSIM_OUT_PATH}/components/ matrix: - MATRIX_BUILD="1" - MATRIX_BUILD="2" @@ -24,7 +26,7 @@ build: - ${SHIPPABLE_BUILD_DIR}/ccache pre_ci_boot: image_name: zephyrprojectrtos/ci - image_tag: v0.4-rc7 + image_tag: v0.4-rc9 pull: true options: "-e HOME=/home/buildslave --privileged=true --tty --net=bridge --user buildslave" @@ -34,6 +36,14 @@ build: if [ "$IS_PULL_REQUEST" = "true" ]; then git rebase origin/${PULL_REQUEST_BASE_BRANCH}; fi + - export NRF_HW_MODELS_VERSION=`cat boards/posix/nrf52_bsim/hw_models_version` + - > + pushd . ; + cd ${BSIM_COMPONENTS_PATH} ; + git clone -b ${NRF_HW_MODELS_VERSION} https://github.com/BabbleSim/ext_NRF52_hw_models.git; + cd /opt/bsim/ ; + make everything -j 8; + popd ; - source zephyr-env.sh - ccache -c -s --max-size=5000M - > @@ -84,7 +94,7 @@ build: - > if [ "$MATRIX_BUILD" = "1" ]; then gcovr -r ${ZEPHYR_BASE} -x > shippable/codecoverage/coverage.xml; - lcov --capture --directory sanity-out/native_posix/ --directory sanity-out/unit_testing/ --output-file lcov.pre.info -q --rc lcov_branch_coverage=1; + lcov --capture --directory sanity-out/native_posix/ --directory sanity-out/nrf52_bsim/ --directory sanity-out/unit_testing/ --output-file lcov.pre.info -q --rc lcov_branch_coverage=1; lcov -q --remove lcov.pre.info mylib.c --remove lcov.pre.info tests/\* --remove lcov.pre.info samples/\* --remove lcov.pre.info ext/\* --remove lcov.pre.info *generated* -o lcov.info --rc lcov_branch_coverage=1; rm lcov.pre.info; rm -rf sanity-out out-2nd-pass; @@ -109,7 +119,7 @@ build: - > if [ "$MATRIX_BUILD" = "1" ]; then gcovr -r ${ZEPHYR_BASE} -x > shippable/codecoverage/coverage.xml; - lcov --capture --directory sanity-out/native_posix/ --directory sanity-out/unit_testing/ --output-file lcov.pre.info -q --rc lcov_branch_coverage=1; + lcov --capture --directory sanity-out/native_posix/ --directory sanity-out/nrf52_bsim/ --directory sanity-out/unit_testing/ --output-file lcov.pre.info -q --rc lcov_branch_coverage=1; lcov -q --remove lcov.pre.info mylib.c --remove lcov.pre.info tests/\* --remove lcov.pre.info samples/\* --remove lcov.pre.info ext/\* --remove lcov.pre.info *generated* -o lcov.info --rc lcov_branch_coverage=1; rm lcov.pre.info; rm -rf sanity-out out-2nd-pass;