mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
Merge branch 'fix-gitlabyml' into 'master'
fix image reference in gitlab.yml See merge request acs/public/villas/fpga/fpga!21
This commit is contained in:
commit
3f69ce6693
1 changed files with 4 additions and 3 deletions
|
@ -44,12 +44,13 @@ test:unit:
|
|||
tags:
|
||||
- docker
|
||||
allow_failure: true
|
||||
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
|
||||
script: |
|
||||
rm -r build && mkdir build && cd build
|
||||
cmake ..
|
||||
make -j$(nproc) unit-tests
|
||||
make -j$(nproc) unit-tests-fpga
|
||||
if [ "$(who | wc -l)" -eq "0" ]; then
|
||||
tests/fpga-unit-tests --jobs 1 --filter 'fpga/*'
|
||||
tests/unit/unit-tests-fpga --jobs 1 --filter 'fpga/*'
|
||||
else
|
||||
echo "System is currently used by: $(who)"
|
||||
echo "We are skipping the test. Please restart manually."
|
||||
|
@ -72,7 +73,7 @@ test:cppcheck:
|
|||
src/
|
||||
lib/
|
||||
tests/unit/ | tee cppcheck.log
|
||||
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
|
||||
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
|
||||
dependencies:
|
||||
- build:source
|
||||
tags:
|
||||
|
|
Loading…
Add table
Reference in a new issue