diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f7a8a1..7ac63e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,6 +60,8 @@ jobs: working-directory: ptrack - name: Install Postgres run: | + rm -rf /home/dev/pgsql + git clean -ffdx if [ "$TESTS" = tap -a "$MODE" = legacy ]; then ./configure CFLAGS='-DEXEC_BACKEND' --disable-atomics --prefix=$PREFIX --enable-debug --enable-cassert --enable-depend --enable-tap-tests --quiet else @@ -70,11 +72,11 @@ jobs: echo $PREFIX/bin >> $GITHUB_PATH working-directory: postgres - name: Install Ptrack - run: make install USE_PGXS=1 + run: git clean -ffdx; make install USE_PGXS=1 working-directory: ptrack - name: Install Pg_probackup - run: make install-pg-probackup USE_PGXS=1 PG_CONFIG=$PREFIX/bin/pg_config top_srcdir=../postgres - working-directory: ptrack + run: make install USE_PGXS=1 PG_CONFIG=$PREFIX/bin/pg_config top_srcdir=../postgres + working-directory: pg_probackup # The sources are checked out by the root but ptrack tests need to write # to the source tree - name: Change the permissions of the ptrack folder diff --git a/Makefile b/Makefile index 84a3f81..54f3e76 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ pg_probackup_dir ?= $(CURDIR)/../pg_probackup # Pg_probackup's Makefile uses top_srcdir when building via PGXS so set it when calling this target install-pg-probackup: echo PATH=$$PATH - export PATH=/home/dev/pgsql/bin:$$PATH; echo PATHnew=$$PATH; $(MAKE) -j $(nproc) -C $(pg_probackup_dir) install USE_PGXS=$(USE_PGXS) PG_CONFIG=$(PG_CONFIG) top_srcdir=$(top_srcdir) + export PATH=/home/dev/pgsql/bin:$$PATH; echo PATHnew=$$PATH; $(MAKE) -j $(nproc) -C $(pg_probackup_dir) install USE_PGXS=$(USE_PGXS) PG_CONFIG=$(PG_CONFIG) top_srcdir=$(CURDIR)/../postgres test-python: env=PG_PROBACKUP_PTRACK=ON; \