CI: not using a custom install prefix for prjtrellis

This commit is contained in:
Jared Boone 2019-04-27 12:48:21 -07:00 committed by Sebastian Birke
parent 2c938e0e8b
commit a3b74f009c
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ task:
memory: 20 memory: 20
dockerfile: .cirrus/Dockerfile.ubuntu16.04 dockerfile: .cirrus/Dockerfile.ubuntu16.04
build_script: mkdir build && cd build && cmake .. -DARCH=all -DTRELLIS_ROOT=/usr/local/src/prjtrellis -DBUILD_TESTS=on && make -j $(nproc) build_script: mkdir build && cd build && cmake .. -DARCH=all -DBUILD_TESTS=on && make -j $(nproc)
submodule_script: git submodule sync --recursive && git submodule update --init --recursive submodule_script: git submodule sync --recursive && git submodule update --init --recursive
test_generic_script: cd build && ./nextpnr-generic-test test_generic_script: cd build && ./nextpnr-generic-test
test_ice40_script: cd build && ./nextpnr-ice40-test test_ice40_script: cd build && ./nextpnr-ice40-test

View File

@ -49,6 +49,6 @@ RUN set -e -x ;\
cd prjtrellis ;\ cd prjtrellis ;\
git reset --hard 668ce3492cbe1566c61760f06bdf676f6fb265c3 ;\ git reset --hard 668ce3492cbe1566c61760f06bdf676f6fb265c3 ;\
cd libtrellis ;\ cd libtrellis ;\
cmake -DCMAKE_INSTALL_PREFIX=/usr . ;\ cmake . ;\
make -j $(nproc) ;\ make -j $(nproc) ;\
make install make install