Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 807df12

Browse filesBrowse files
kulaginmkulaginm
committed
travis: more universal indication of the name of the ptraсk patch
1 parent 034c597 commit 807df12
Copy full SHA for 807df12

File tree

4 files changed

+25
-24
lines changed
Filter options

4 files changed

+25
-24
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+18-17Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,31 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
- PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_VERSION=master
30-
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_VERSION=14
31-
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13
32-
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_VERSION=12
33-
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_VERSION=11
29+
- PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
30+
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
31+
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
32+
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
33+
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
3434
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
3535
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
3636
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
37-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=archive
38-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=backup
39-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=catchup
40-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=compression
41-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=delta
42-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=locking
43-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=merge
44-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=page
45-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=ptrack
46-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=replica
47-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=retention
48-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=restore
37+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive
38+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
39+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
40+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression
41+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta
42+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking
43+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
44+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page
45+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
46+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
47+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention
48+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
4949

5050
jobs:
5151
allow_failures:
5252
- if: env(PG_BRANCH) = master
53+
- if: env(PG_BRANCH) = 9.5
5354
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
5455

5556
# Only run CI for master branch commits to limit our travis usage

‎travis/Dockerfile.in

Copy file name to clipboardExpand all lines: travis/Dockerfile.in
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN python3 -m pip install virtualenv
1010

1111
# Environment
1212
ENV PG_MAJOR=${PG_VERSION} PG_BRANCH=${PG_BRANCH}
13-
ENV PTRACK_PATCH_PG_VERSION=${PTRACK_PATCH_PG_VERSION}
13+
ENV PTRACK_PATCH_PG_BRANCH=${PTRACK_PATCH_PG_BRANCH}
1414
ENV PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
1515
ENV LANG=C.UTF-8 PGHOME=/pg/testdir/pgbin
1616

‎travis/make_dockerfile.sh

Copy file name to clipboardExpand all lines: travis/make_dockerfile.sh
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ if [ -z ${MODE+x} ]; then
1414
MODE=basic
1515
fi
1616

17-
if [ -z ${PTRACK_PATCH_PG_VERSION+x} ]; then
18-
PTRACK_PATCH_PG_VERSION=off
17+
if [ -z ${PTRACK_PATCH_PG_BRANCH+x} ]; then
18+
PTRACK_PATCH_PG_BRANCH=off
1919
fi
2020

2121
if [ -z ${PGPROBACKUP_GDB+x} ]; then
@@ -25,13 +25,13 @@ fi
2525
echo PG_VERSION=${PG_VERSION}
2626
echo PG_BRANCH=${PG_BRANCH}
2727
echo MODE=${MODE}
28-
echo PTRACK_PATCH_PG_VERSION=${PTRACK_PATCH_PG_VERSION}
28+
echo PTRACK_PATCH_PG_BRANCH=${PTRACK_PATCH_PG_BRANCH}
2929
echo PGPROBACKUP_GDB=${PGPROBACKUP_GDB}
3030

3131
sed \
3232
-e 's/${PG_VERSION}/'${PG_VERSION}/g \
3333
-e 's/${PG_BRANCH}/'${PG_BRANCH}/g \
3434
-e 's/${MODE}/'${MODE}/g \
35-
-e 's/${PTRACK_PATCH_PG_VERSION}/'${PTRACK_PATCH_PG_VERSION}/g \
35+
-e 's/${PTRACK_PATCH_PG_BRANCH}/'${PTRACK_PATCH_PG_BRANCH}/g \
3636
-e 's/${PGPROBACKUP_GDB}/'${PGPROBACKUP_GDB}/g \
3737
Dockerfile.in > Dockerfile

‎travis/run_tests.sh

Copy file name to clipboardExpand all lines: travis/run_tests.sh
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "############### Getting Postgres sources:"
3333
git clone https://github.com/postgres/postgres.git -b $PG_BRANCH --depth=1
3434

3535
# Clone ptrack
36-
if [ "$PTRACK_PATCH_PG_VERSION" != "off" ]; then
36+
if [ "$PTRACK_PATCH_PG_BRANCH" != "off" ]; then
3737
git clone https://github.com/postgrespro/ptrack.git -b master --depth=1
3838
export PG_PROBACKUP_PTRACK=on
3939
else
@@ -45,7 +45,7 @@ fi
4545
echo "############### Compiling Postgres:"
4646
cd postgres # Go to postgres dir
4747
if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then
48-
git apply -3 ../ptrack/patches/REL_${PTRACK_PATCH_PG_VERSION}_STABLE-ptrack-core.diff
48+
git apply -3 ../ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
4949
fi
5050
CFLAGS="-O0" ./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests
5151
make -s -j$(nproc) install

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.