diff options
| author | Jared Boone <jboone@earfeast.com> | 2019-04-27 12:48:21 -0700 |
|---|---|---|
| committer | Sebastian Birke <git@se-bi.de> | 2020-02-04 18:19:52 +0100 |
| commit | a3b74f009c577860a1c2b7f618f3c9576586a1f2 (patch) | |
| tree | 003774ef09fa30be7e41ad8703e5c0bd320fd0a9 | |
| parent | 2c938e0e8bd67f479dc4635f510c82603581a58d (diff) | |
| download | nextpnr-a3b74f009c577860a1c2b7f618f3c9576586a1f2.tar.gz nextpnr-a3b74f009c577860a1c2b7f618f3c9576586a1f2.tar.bz2 nextpnr-a3b74f009c577860a1c2b7f618f3c9576586a1f2.zip | |
CI: not using a custom install prefix for prjtrellis
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .cirrus/Dockerfile.ubuntu16.04 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index bdb3c48c..d947b559 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 -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 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 fa40b6c1..d7600ded 100644 --- a/.cirrus/Dockerfile.ubuntu16.04 +++ b/.cirrus/Dockerfile.ubuntu16.04 @@ -49,6 +49,6 @@ RUN set -e -x ;\ cd prjtrellis ;\ git reset --hard 668ce3492cbe1566c61760f06bdf676f6fb265c3 ;\ cd libtrellis ;\ - cmake -DCMAKE_INSTALL_PREFIX=/usr . ;\ + cmake . ;\ make -j $(nproc) ;\ make install |