From d64f7051995575c2c1044d7c0d6fd7dcaa07beb6 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Sat, 1 Jun 2024 15:13:27 +0200 Subject: Perform distcheck in another build tree As we are now copying the contents of the render/ and manual/ directories under test/html, any remaining files from a previous build will be included. To prevent errors from a previous `make check` command, we make the check and distcheck in different build directories. --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f8c1793..653a99bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,13 +15,13 @@ jobs: - name: autogen run: ./autogen.sh - name: Make install dir - run: mkdir install + run: mkdir install build - name: configure - run: ./configure --prefix=$(readlink -f install) --enable-html-tests + run: cd build && ../configure --prefix=$(readlink -f ../install) --enable-html-tests - name: make - run: make + run: cd build && make - name: make install - run: make install + run: cd build && make install - name: Copy config to .dillo run: | mkdir -p ~/.dillo/ @@ -29,12 +29,13 @@ jobs: - name: make check run: | export DILLOBIN=$(readlink -f install/bin/dillo) - make check || (cat test/html/test-suite.log; false) + cd build && make check || (cat test/html/test-suite.log; false) - name: make distcheck (with HTML tests) run: | export DILLOBIN= - export DISTCHECK_CONFIGURE_FLAGS=--enable-html-tests - make distcheck + mkdir build-distcheck install-distcheck + cd build-distcheck && ../configure --prefix=$(readlink -f ../install-distcheck) --enable-html-tests + make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-html-tests # - name: Remove pipes # run: find test/html -type p -delete || true # - name: Archive production artifacts -- cgit v1.2.3