diff options
| -rw-r--r-- | .github/workflows/push.yml | 5 | ||||
| -rwxr-xr-x | dist/ci-run.sh | 31 | ||||
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | testsuite/requirements.txt | 2 |
4 files changed, 26 insertions, 14 deletions
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 46346ae1e..55d1cc3e7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,6 +6,7 @@ on: env: CI: true + DOCKER_BUILDKIT: 1 jobs: @@ -137,6 +138,7 @@ jobs: base-devel git mingw-w64-${{ matrix.arch }}-toolchain + mingw-w64-${{ matrix.arch }}-python-pip - run: git config --global core.autocrlf input shell: bash @@ -170,8 +172,7 @@ jobs: - name: Test package run: | - env | grep MSYSTEM - env | grep MINGW + pip3 install -r testsuite/requirements.txt GHDL=ghdl ./testsuite/testsuite.sh env: MSYSTEM: ${{ matrix.installs }} diff --git a/dist/ci-run.sh b/dist/ci-run.sh index 928fa201a..c61169f9f 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -420,32 +420,43 @@ ci_run () { if [ "x$IS_MACOS" = "xtrue" ]; then CC=clang \ prefix="`cd ./install-mcode; pwd`/usr/local" \ - ./testsuite/testsuite.sh sanity pyunit gna vests vpi + ./testsuite/testsuite.sh sanity gna vests vpi else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl + + tests="sanity" + case "$GHDL_IMAGE_TAG" in - *ubuntu*|*buster*) + *ubuntu20*|*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 + tests+=" pyunit" ;; *) GHDL_TEST_IMAGE="ghdl/ghdl:$GHDL_IMAGE_TAG" ;; esac - # Run test in docker container - tests="sanity pyunit" + if [ "x$ISGPL" != "xtrue" ]; then - tests="$tests gna" + tests+=" gna" fi - tests="$tests vests" + + tests+=" vests" + if [ "x$ISSYNTH" = "xtrue" ]; then - tests="$tests synth" + tests+=" synth" fi - tests="$tests vpi" + + tests+=" vpi" + + # Run tests in docker container $RUN "$GHDL_TEST_IMAGE" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" fi 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 |