diff --git a/.cirrus.yml b/.cirrus.yml index a493b04f..5221be46 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ task: memory: 20 dockerfile: .cirrus/Dockerfile.ubuntu16.04 - build_script: mkdir build && cd build && cmake .. -DARCH=all -DBUILD_TESTS=on && make -j $(nproc) + build_script: mkdir build && cd build && cmake .. -DARCH=all -DOXIDE_INSTALL_PREFIX=$HOME/.cargo -DBUILD_TESTS=on && make -j3 submodule_script: git submodule sync --recursive && git submodule update --init --recursive test_generic_script: cd build && ./nextpnr-generic-test test_ice40_script: cd build && ./nextpnr-ice40-test diff --git a/.cirrus/Dockerfile.ubuntu16.04 b/.cirrus/Dockerfile.ubuntu16.04 index 92ab2bae..e8de4ed9 100644 --- a/.cirrus/Dockerfile.ubuntu16.04 +++ b/.cirrus/Dockerfile.ubuntu16.04 @@ -9,7 +9,7 @@ RUN set -e -x ;\ build-essential autoconf cmake clang bison wget flex gperf \ libreadline-dev gawk tcl-dev libffi-dev graphviz xdot python3-dev \ libboost-all-dev qt5-default git libftdi-dev pkg-config libeigen3-dev \ - zlib1g-dev + zlib1g-dev curl RUN set -e -x ;\ mkdir -p /usr/local/src ;\ @@ -52,3 +52,13 @@ RUN set -e -x ;\ cmake . ;\ make -j $(nproc) ;\ make install + +RUN set -e -x ;\ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ;\ + mkdir -p /usr/local/src ;\ + cd /usr/local/src ;\ + git clone --recursive https://github.com/daveshah1/prjoxide.git ;\ + cd prjoxide ;\ + git reset --hard bd5122fab12c1a517588365bd95cbfaa47eff25c ;\ + cd libprjoxide ;\ + PATH=$PATH:$HOME/.cargo/bin cargo install --path prjoxide diff --git a/.cirrus/archcheck.sh b/.cirrus/archcheck.sh index fde19216..35f115d0 100755 --- a/.cirrus/archcheck.sh +++ b/.cirrus/archcheck.sh @@ -4,3 +4,4 @@ echo "Running archcheck!" ${BUILD_DIR}/nextpnr-ice40 --hx8k --package ct256 --test ${BUILD_DIR}/nextpnr-ice40 --up5k --package sg48 --test ${BUILD_DIR}/nextpnr-ecp5 --um5g-25k --package CABGA381 --test +${BUILD_DIR}/nextpnr-nexus --device LIFCL-40-9BG400CES --test