Skip to content

Commit 148afb2

Browse files
committed
Merge branch 'master' into release_2_5
2 parents 7ca590c + e68132d commit 148afb2

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
- PG_VERSION=12 PG_BRANCH=REL_13_STABLE
29+
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE
3030
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE
3131
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE
3232
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE

tests/archive.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,9 @@ def test_basic_master_and_replica_concurrent_archiving(self):
900900
set replica with archiving,
901901
make sure that archiving on both node is working.
902902
"""
903+
if self.pg_config_version < self.version_to_num('9.6.0'):
904+
return unittest.skip('You need PostgreSQL >= 9.6 for this test')
905+
903906
fname = self.id().split('.')[3]
904907
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
905908
master = self.make_simple_node(

travis/run_tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ echo "############### Compiling Postgres:"
3737
cd postgres # Go to postgres dir
3838
./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests
3939
make -s -j$(nproc) install
40+
#make -s -j$(nproc) -C 'src/common' install
41+
#make -s -j$(nproc) -C 'src/port' install
42+
#make -s -j$(nproc) -C 'src/interfaces' install
4043
make -s -j$(nproc) -C contrib/ install
4144

4245
# Override default Postgres instance

0 commit comments

Comments
 (0)