From b1b64fba1f54d3b1ee2656c13884471cf2b1b3a5 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 01:04:37 +0100 Subject: ci: install requirements in temporary containers --- dist/ci-run.sh | 7 +++++-- doc/requirements.txt | 2 +- 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 -- cgit v1.2.3 From e4e7afab58b8f868cbfe279a915ac6be799c6916 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 01:35:48 +0100 Subject: ci: install testsuite Python requirements on MSYS2 jobs --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 46346ae1e..5e1cbdb29 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -137,6 +137,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 +171,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 }} -- cgit v1.2.3 From 8816082c3787784f8475f4c59a4a84c5704e15d0 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 01:37:20 +0100 Subject: ci: set DOCKER_BUILDKIT envvar --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5e1cbdb29..55d1cc3e7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,6 +6,7 @@ on: env: CI: true + DOCKER_BUILDKIT: 1 jobs: -- cgit v1.2.3 From 12ef35a90d65dbd6f542698f6c517403402b4fa5 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 01:53:24 +0100 Subject: ci: skip pyunit on Ubuntu <20 --- dist/ci-run.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dist/ci-run.sh b/dist/ci-run.sh index e71229194..5a78d080f 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -424,8 +424,11 @@ ci_run () { 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" . -f- <<-EOF # syntax=docker/dockerfile:experimental @@ -434,21 +437,26 @@ 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 -- cgit v1.2.3 From 718da371523f37a45cbca6c83cc26ef84b7140ec Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 01:54:51 +0100 Subject: ci: skip pyunit on macOS (because libghdl is disabled) --- dist/ci-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/ci-run.sh b/dist/ci-run.sh index 5a78d080f..c61169f9f 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -420,7 +420,7 @@ 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 -- cgit v1.2.3