db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

Fix incorrect PG_PROBACKUP_PTRACK definition in travis tests (led to the inability to run ptraсk tests)

Browse Source
This commit is contained in:
Mikhail A. Kulagin
2022-04-12 10:02:17 +03:00
parent 06994293a2
commit 07ef97ea6e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+12 -12
View File
@@ -34,18 +34,18 @@ env:
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=locking
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=page
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=retention
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
jobs: jobs:
allow_failures: allow_failures:
travis/make_dockerfile.sh
+1 -1
View File
@@ -15,7 +15,7 @@ if [ -z ${MODE+x} ]; then
fi fi
if [ -z ${PTRACK_PATCH_PG_BRANCH+x} ]; then if [ -z ${PTRACK_PATCH_PG_BRANCH+x} ]; then
PTRACK_PATCH_PG_BRANCH=off PTRACK_PATCH_PG_BRANCH=OFF
fi fi
if [ -z ${PGPROBACKUP_GDB+x} ]; then if [ -z ${PGPROBACKUP_GDB+x} ]; then
travis/run_tests.sh
+6 -6
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Copyright (c) 2019-2020, Postgres Professional # Copyright (c) 2019-2022, Postgres Professional
# #
set -xe set -xe
@@ -33,18 +33,18 @@ echo "############### Getting Postgres sources:"
git clone https://github.com/postgres/postgres.git -b $PG_BRANCH --depth=1 git clone https://github.com/postgres/postgres.git -b $PG_BRANCH --depth=1
# Clone ptrack # Clone ptrack
if [ "$PTRACK_PATCH_PG_BRANCH" != "off" ]; then if [ "$PTRACK_PATCH_PG_BRANCH" != "OFF" ]; then
git clone https://github.com/postgrespro/ptrack.git -b master --depth=1 git clone https://github.com/postgrespro/ptrack.git -b master --depth=1
export PG_PROBACKUP_PTRACK=on export PG_PROBACKUP_PTRACK=ON
else else
export PG_PROBACKUP_PTRACK=off export PG_PROBACKUP_PTRACK=OFF
fi fi
# Compile and install Postgres # Compile and install Postgres
echo "############### Compiling Postgres:" echo "############### Compiling Postgres:"
cd postgres # Go to postgres dir cd postgres # Go to postgres dir
if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
git apply -3 ../ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff git apply -3 ../ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
fi fi
CFLAGS="-O0" ./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests CFLAGS="-O0" ./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests
@@ -59,7 +59,7 @@ export PATH=$PGHOME/bin:$PATH
export LD_LIBRARY_PATH=$PGHOME/lib export LD_LIBRARY_PATH=$PGHOME/lib
export PG_CONFIG=$(which pg_config) export PG_CONFIG=$(which pg_config)
if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
echo "############### Compiling Ptrack:" echo "############### Compiling Ptrack:"
make USE_PGXS=1 -C ../ptrack install make USE_PGXS=1 -C ../ptrack install
fi fi