diff options
| author | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-28 21:46:06 +0100 |
|---|---|---|
| committer | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-28 23:48:09 +0100 |
| commit | 1880a6086c63994029b2c56b4a9f9183b11f5d63 (patch) | |
| tree | 7287140aa8c177234680597f016ea372ad13b490 /dist | |
| parent | 147375c38a56820595df54047ad904cdc21d94ec (diff) | |
| download | ghdl-1880a6086c63994029b2c56b4a9f9183b11f5d63.tar.gz ghdl-1880a6086c63994029b2c56b4a9f9183b11f5d63.tar.bz2 ghdl-1880a6086c63994029b2c56b4a9f9183b11f5d63.zip | |
ci: on ubuntu jobs, add temporary image with Python for testing 'pyunit' testsuite
Diffstat (limited to 'dist')
| -rwxr-xr-x | dist/ci-run.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index eb82c7e99..70e6b6d44 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -424,6 +424,18 @@ ci_run () { else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl + case "$GHDL_IMAGE_TAG" in + *ubuntu*) + GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" + docker build -t "$GHDL_TEST_IMAGE" - <<-EOF +FROM ghdl/ghdl:$GHDL_IMAGE_TAG +RUN apt update -qq && apt install -y python3 +EOF + ;; + *) + GHDL_TEST_IMAGE="ghdl/ghdl:$GHDL_IMAGE_TAG" + ;; + esac # Run test in docker container tests="sanity pyunit" if [ "x$ISGPL" != "xtrue" ]; then @@ -434,7 +446,7 @@ ci_run () { tests="$tests synth" fi tests="$tests vpi" - $RUN "ghdl/ghdl:$GHDL_IMAGE_TAG" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" + $RUN "$GHDL_TEST_IMAGE" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" fi if [ ! -f testsuite/test_ok ]; then |