external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from EvgeniyPatlan/main 

DISTPG-530 Update build flow
pull/391/head
EvgeniyPatlan 2023-02-27 12:15:35 +01:00 committed by GitHub
parent 088c85f8db df3945aa39
commit c7cb3d08be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
percona-packaging/scripts/pg_stat_monitor_builder.sh
View File

@ -84,14 +84,6 @@ check_workdir(){
return return
} }
add_percona_yum_repo(){
if [ ! -f /etc/yum.repos.d/percona-dev.repo ]; then
curl -o /etc/yum.repos.d/percona-dev.repo https://jenkins.percona.com/yum-repo/percona-dev.repo
sed -i 's:$basearch:x86_64:g' /etc/yum.repos.d/percona-dev.repo
fi
return
}
set_changelog(){ set_changelog(){
if [ -z $1 ] if [ -z $1 ]
then then
@ -209,19 +201,18 @@ install_deps() {
if [ "$OS" == "rpm" ] if [ "$OS" == "rpm" ]
then then
yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm
add_percona_yum_repo
if [[ ${PG_RELEASE} == "11" ]]; then if [[ ${PG_RELEASE} == "11" ]]; then
percona-release enable ppg-11 release percona-release enable ppg-11 release
elif [[ $PG_RELEASE == "12" ]]; then elif [[ $PG_RELEASE == "12" ]]; then
percona-release enable ppg-12 release percona-release enable ppg-12 release
fi fi
yum -y install git wget yum -y install git wget
PKGLIST="percona-postgresql-common percona-postgresql${PG_RELEASE}-devel" PKGLIST="percona-postgresql${PG_RELEASE}-devel"
PKGLIST+=" clang-devel git clang llvm-devel rpmdevtools vim wget" PKGLIST+=" clang-devel git clang llvm-devel rpmdevtools vim wget"
PKGLIST+=" perl binutils gcc gcc-c++" PKGLIST+=" perl binutils gcc gcc-c++"
PKGLIST+=" clang-devel llvm-devel git rpm-build rpmdevtools wget gcc make autoconf" PKGLIST+=" clang-devel llvm-devel git rpm-build rpmdevtools wget gcc make autoconf"
if [[ "${RHEL}" -eq 8 ]]; then if [[ "${RHEL}" -ge 8 ]]; then
dnf -y module disable postgresql dnf -y module disable postgresql || true
elif [[ "${RHEL}" -eq 7 ]]; then elif [[ "${RHEL}" -eq 7 ]]; then
PKGLIST+=" llvm-toolset-7-clang llvm-toolset-7-llvm-devel llvm5.0-devel" PKGLIST+=" llvm-toolset-7-clang llvm-toolset-7-llvm-devel llvm5.0-devel"
until yum -y install epel-release centos-release-scl; do until yum -y install epel-release centos-release-scl; do

2
rpm/pg-stat-monitor.spec
View File

@ -12,7 +12,7 @@ Source0: percona-pg-stat-monitor%{pgrel}-%{version}.tar.gz
URL: https://github.com/Percona-Lab/pg_stat_monitor URL: https://github.com/Percona-Lab/pg_stat_monitor
BuildRequires: percona-postgresql%{pgrel}-devel BuildRequires: percona-postgresql%{pgrel}-devel
Requires: postgresql-server Requires: postgresql-server
Provides: percona-pg-stat-monitor%{pgrel} Provides: percona-pg-stat-monitor%{pgrel}
Conflicts: percona-pg-stat-monitor%{pgrel} Conflicts: percona-pg-stat-monitor%{pgrel}
Obsoletes: percona-pg-stat-monitor%{pgrel} Obsoletes: percona-pg-stat-monitor%{pgrel}
Epoch: 1 Epoch: 1