diff options
| author | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-29 01:04:37 +0100 |
|---|---|---|
| committer | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-29 01:40:20 +0100 |
| commit | b1b64fba1f54d3b1ee2656c13884471cf2b1b3a5 (patch) | |
| tree | 072121065ec1d049a81a95bcae943ea5a5f833a0 | |
| parent | 3427a61b81b542bb683e8f1e5dd376aaa184e575 (diff) | |
| download | ghdl-b1b64fba1f54d3b1ee2656c13884471cf2b1b3a5.tar.gz ghdl-b1b64fba1f54d3b1ee2656c13884471cf2b1b3a5.tar.bz2 ghdl-b1b64fba1f54d3b1ee2656c13884471cf2b1b3a5.zip | |
ci: install requirements in temporary containers
| -rwxr-xr-x | dist/ci-run.sh | 7 | ||||
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | testsuite/requirements.txt | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index 928fa201a..e71229194 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -427,9 +427,12 @@ ci_run () { case "$GHDL_IMAGE_TAG" in *ubuntu*|*buster*) GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" - docker build -t "$GHDL_TEST_IMAGE" - <<-EOF + docker build -t "$GHDL_TEST_IMAGE" . -f- <<-EOF +# syntax=docker/dockerfile:experimental FROM ghdl/ghdl:$GHDL_IMAGE_TAG -RUN apt update -qq && apt install -y python3 +RUN apt update -qq && apt install -y python3 python3-pip +RUN --mount=type=bind,src=./,target=/tmp/ghdl/ \ + pip3 install -r /tmp/ghdl/testsuite/requirements.txt EOF ;; *) diff --git a/doc/requirements.txt b/doc/requirements.txt index e632e6afd..1c95fd25e 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,4 @@ -#-r ../requirements.txt +-r ../pyGHDL/requirements.txt sphinx>=3.0.0 recommonmark python-dateutil diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt index f7196c036..ce54b669b 100644 --- a/testsuite/requirements.txt +++ b/testsuite/requirements.txt @@ -1,4 +1,4 @@ --r ../requirements.txt +-r ../pyGHDL/requirements.txt # Coverage collection Coverage>=5.3 |