Skip to content

Build both python and python3 plugins. #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorpeshansky merged 5 commits into from
Jun 29, 2022
Merged

Build both python and python3 plugins. #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
048b8ea
Install both Python 2 and Python 3 libraries.
igorpeshansky Jun 22, 2022
2d4390c
Build both python and python3.
igorpeshansky Jun 23, 2022
550e405
Bump minor version, as the python3 plugin is a new feature.
igorpeshansky Jun 24, 2022
69612b8
Also in the sles12 and sles15 build containers.
igorpeshansky Jun 24, 2022
a566436
Fix Amazon package python dependency; install both in the amzn contai…
igorpeshansky Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The release version and build number of the stackdriver-agent package.
PKG_VERSION=6.2.1
PKG_VERSION=6.3.0
PKG_BUILD=1
3 changes: 2 additions & 1 deletion build/x86_64_amzn-2016.09/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ RUN yum -y install epel-release \
perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python-devel \
python2-devel \
python36-devel \
rpm-build \
rpm-sign \
varnish-libs-devel \
Expand Down
3 changes: 2 additions & 1 deletion build/x86_64_bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ RUN apt-get -y update \
lsb-release \
make \
pkg-config \
python-dev \
python2-dev \
python3-dev \
&& apt-get -y clean \
&& rm -rf /var/lib/apt/lists/*
3 changes: 2 additions & 1 deletion build/x86_64_buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get -y update \
libyajl-dev \
make \
pkg-config \
python-dev \
python2-dev \
python3-dev \
&& apt-get -y clean \
&& rm -rf /var/lib/apt/lists/*
3 changes: 2 additions & 1 deletion build/x86_64_centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ RUN yum -y install epel-release \
perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python-devel \
python2-devel \
python3-devel \
rpm-build \
rpm-sign \
varnish-libs-devel \
Expand Down
1 change: 1 addition & 0 deletions build/x86_64_centos8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN dnf -y install 'dnf-command(config-manager)' \
pkgconfig \
postgresql-devel \
python2-devel \
python3-devel \
rpm-build \
rpm-sign \
varnish-libs-devel \
Expand Down
3 changes: 2 additions & 1 deletion build/x86_64_focal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN apt-get -y update \
lsb-release \
make \
pkg-config \
python-dev-is-python2 \
python2-dev \
python3-dev \
&& apt-get -y clean \
&& rm -rf /var/lib/apt/lists/*
3 changes: 2 additions & 1 deletion build/x86_64_sles12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ RUN true \
openssl-devel \
pkg-config \
postgresql-devel \
python-devel \
python2-devel \
python3-devel \
rpm-build \
varnish-devel \
which \
Expand Down
3 changes: 2 additions & 1 deletion build/x86_64_sles15/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ RUN zypper addrepo https://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/l
openssl-devel \
pkg-config \
postgresql-devel \
python-devel \
python2-devel \
python3-devel \
rpm-build \
varnish-devel \
which \
Expand Down
1 change: 1 addition & 0 deletions deb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ override_dh_auto_configure:
--enable-plugin_mem \
--enable-processes \
--enable-python \
--enable-python3 \
--enable-ntpd \
--enable-nfs \
--enable-stackdriver_agent \
Expand Down
9 changes: 9 additions & 0 deletions rpm/stackdriver-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
%define curl_version 7.34.0
%define java_version 1.6.0
%define java_lib_location /usr/lib/jvm/java
%define use_python36 0
# Enabled for systems that don't support the __provides_exclude_from global.
%define dep_filter 1

Expand All @@ -53,6 +54,7 @@

%if 0%{?amzn} >= 1
%define bundle_yajl 1
%define use_python36 1
%define dep_filter 0
%endif

Expand Down Expand Up @@ -109,6 +111,11 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::Embed)
%endif
BuildRequires: python2-devel
%if ! %{use_python36}
BuildRequires: python3-devel
%else
BuildRequires: python36-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: autoconf, automake
%if 0%{?suse_version} > 0
Expand Down Expand Up @@ -200,6 +207,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%filter_requires_in write_gcm
%filter_requires_in java
%filter_requires_in python
%filter_requires_in python3
%filter_setup

%description
Expand Down Expand Up @@ -264,6 +272,7 @@ export PATH=%{buildroot}/%{_prefix}/bin:$PATH
--enable-plugin_mem \
--enable-processes \
--enable-python \
--enable-python3 \
--enable-ntpd \
--enable-nfs \
--enable-stackdriver_agent \
Expand Down