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 5b6ca62

Browse filesBrowse files
kulaginmkulaginm
committed
[ci skip] packaging "tuning"
1 parent 36e6d0f commit 5b6ca62
Copy full SHA for 5b6ca62

File tree

8 files changed

+40
-4
lines changed
Filter options

8 files changed

+40
-4
lines changed

‎packaging/Makefile.repo

Copy file name to clipboardExpand all lines: packaging/Makefile.repo
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ build/repo_suse_15.2:
113113
repo_finish:
114114
# cd build/data/www/$(PBK_PKG_REPO)/
115115
cd $(BUILDDIR)/data/www/$(PBK_PKG_REPO)/rpm && sudo ln -nsf $(PBK_VERSION) latest
116+
# following line only for vanilla
116117
cd $(BUILDDIR)/data/www/$(PBK_PKG_REPO)/srpm && sudo ln -nsf $(PBK_VERSION) latest
117118

118119
# sudo ln -rfs build/data/www/$(PBK_PKG_REPO)/rpm/${PBK_VERSION} build/data/www/$(PBK_PKG_REPO)/rpm/latest

‎packaging/Makefile.test

Copy file name to clipboardExpand all lines: packaging/Makefile.test
+13-1Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build/test_all: build/test_debian build/test_ubuntu build/test_centos build/test
1313
@echo Package testing is done
1414

1515
### DEBIAN
16-
build/test_debian: build/test_debian_9 build/test_debian_10 build/test_debian_11
16+
build/test_debian: build/test_debian_9 build/test_debian_10 #build/test_debian_11
1717
@echo Debian: done
1818

1919
build/test_debian_9: build/test_debian_9_9.6 build/test_debian_9_10 build/test_debian_9_11 build/test_debian_9_12 build/test_debian_9_13
@@ -58,29 +58,41 @@ build/test_centos: build/test_centos_7 build/test_centos_8
5858
@echo Centos: done
5959

6060
build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13
61+
# pgpro
62+
#build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12
6163
@echo Centos 7: done
6264

6365
build/test_centos_8: build/test_centos_8_9.6 build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12 build/test_centos_8_13
66+
# pgpro
67+
#build/test_centos_8: build/test_centos_8_10 build/test_centos_8_11 build/test_centos_8_12
6468
@echo Centos 8: done
6569

6670
# Oracle Linux
6771
build/test_oraclelinux: build/test_oraclelinux_7 build/test_oraclelinux_8
6872
@echo Oraclelinux: done
6973

7074
build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12 build/test_oraclelinux_7_13
75+
# pgpro
76+
#build/test_oraclelinux_7: build/test_oraclelinux_7_9.6 build/test_oraclelinux_7_10 build/test_oraclelinux_7_11 build/test_oraclelinux_7_12
7177
@echo Oraclelinux 7: done
7278

7379
build/test_oraclelinux_8: build/test_oraclelinux_8_9.6 build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12 build/test_oraclelinux_8_13
80+
# pgpro
81+
#build/test_oraclelinux_8: build/test_oraclelinux_8_10 build/test_oraclelinux_8_11 build/test_oraclelinux_8_12
7482
@echo Oraclelinux 8: done
7583

7684
# RHEL
7785
build/test_rhel: build/test_rhel_7 build/test_rhel_8
7886
@echo Rhel: done
7987

8088
build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13
89+
# pgpro
90+
#build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12
8191
@echo Rhel 7: done
8292

8393
build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13
94+
# pgpro
95+
#build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12
8496
@echo Rhel 8: done
8597

8698
define test_rpm

‎packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-pgpro.spec

Copy file name to clipboardExpand all lines: packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-pgpro.spec
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mkdir %{_topdir}/SOURCES/pg_probackup-%{version}
4242
cd %{_topdir}/BUILD/postgrespro-%{edition}-%{pgsql_full}
4343

4444
%if "%{pgsql_major}" == "9.6"
45-
./configure --enable-debug
45+
./configure --enable-debug --without-readline
4646
%else
4747
./configure --enable-debug --without-readline --prefix=%{prefix}
4848
%endif

‎packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup.alt.forks.spec

Copy file name to clipboardExpand all lines: packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup.alt.forks.spec
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cd %{_topdir}/BUILD/postgrespro-%{edition}-%{pgsql_full}
4343
%if "%{pgsql_major}" == "9.6"
4444
./configure --enable-debug
4545
%else
46-
./configure --enable-debug --prefix=%{prefix}
46+
./configure --enable-debug --disable-online-upgrade --prefix=%{prefix}
4747
%endif
4848
make -C 'src/common'
4949
make -C 'src/port'

‎packaging/test/Makefile.debian

Copy file name to clipboardExpand all lines: packaging/test/Makefile.debian
+21Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,24 @@ build/test_debian_10_12:
3939
build/test_debian_10_13:
4040
$(call test_deb,debian,10,buster,13,13.2)
4141
touch build/test_debian_10_13
42+
43+
# DEBIAN 11
44+
build/test_debian_11_9.6:
45+
$(call test_deb,debian,11,bullseye,9.6,9.6.21)
46+
touch build/test_debian_11_9.6
47+
48+
build/test_debian_11_10:
49+
$(call test_deb,debian,11,bullseye,10,10.16)
50+
touch build/test_debian_11_10
51+
52+
build/test_debian_11_11:
53+
$(call test_deb,debian,11,bullseye,11,11.11)
54+
touch build/test_debian_11_11
55+
56+
build/test_debian_11_12:
57+
$(call test_deb,debian,11,bullseye,12,12.6)
58+
touch build/test_debian_11_12
59+
60+
build/test_debian_11_13:
61+
$(call test_deb,debian,11,bullseye,13,13.2)
62+
touch build/test_debian_11_13

‎packaging/test/scripts/deb.sh

Copy file name to clipboardExpand all lines: packaging/test/scripts/deb.sh
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
1717
export DEBIAN_FRONTEND=noninteractive
1818
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
1919

20+
#apt-get -qq --allow-releaseinfo-change update
2021
apt-get -qq update
2122
apt-get -qq install -y wget nginx gnupg lsb-release
2223
#apt-get -qq install -y libterm-readline-gnu-perl dialog gnupg procps
@@ -45,7 +46,7 @@ nginx -s reload || (pkill -9 nginx || nginx -c /etc/nginx/nginx.conf &)
4546
# install POSTGRESQL
4647
#if [ ${CODENAME} == 'precise' ] && [ ${PG_VERSION} != '10' ] && [ ${PG_VERSION} != '11' ]; then
4748
sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
48-
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
49+
wget --no-check-certificate -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
4950
apt-get update -y
5051
apt-get install -y postgresql-${PG_VERSION}
5152
#fi

‎packaging/test/scripts/rpm.sh

Copy file name to clipboardExpand all lines: packaging/test/scripts/rpm.sh
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ulimit -n 1024
1313

1414
PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
1515

16+
yum update -y
1617
# yum upgrade -y || echo 'some packages in docker failed to upgrade'
1718
# yum install -y sudo
1819
if [ ${DISTRIB} == 'rhel' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG13 on PGDG

‎packaging/test/scripts/suse_forks.sh

Copy file name to clipboard
100644100755
Expand all lines: packaging/test/scripts/suse_forks.sh
File mode changed.

0 commit comments

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