Skip to content

Commit

Permalink
build: upgrade to 3.5.9
Browse files Browse the repository at this point in the history
  • Loading branch information
mstyushin committed Aug 19, 2024
1 parent 4f1a44c commit 29961c2
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mamonsu-tests-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
id: zabbix_address
- name: Edit Zabbix address in agent.conf
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf

- name: Copy test scripts to container
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mamonsu-tests-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
id: zabbix_address
- name: Edit Zabbix address in agent.conf
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf

- name: Copy test scripts to container
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/
Expand Down
4 changes: 2 additions & 2 deletions github-actions-tests/mamonsu_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [ "${OS%:*}" = "centos" ]; then
python3 setup.py build && python3 setup.py install
make rpm
sudo rpm -i ./mamonsu*.rpm
cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf > /etc/mamonsu/agent.conf
cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf > /etc/mamonsu/agent.conf
systemctl daemon-reload
systemctl restart mamonsu
sleep 5
Expand All @@ -64,7 +64,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
python3 setup.py build && python3 setup.py install
make deb
sudo dpkg -i ./mamonsu*.deb
cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf > /etc/mamonsu/agent.conf
cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf > /etc/mamonsu/agent.conf
service mamonsu restart
sleep 5
echo && echo && echo "mamonsu version:"
Expand Down
2 changes: 1 addition & 1 deletion mamonsu/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__author__ = 'Dmitry Vasilyev'
__author_email__ = '[email protected]'
__description__ = 'Monitoring agent for PostgreSQL'
__version__ = '3.5.8'
__version__ = '3.5.9'
__licence__ = 'BSD'

__url__ = 'https://github.com/postgrespro/mamonsu'
Expand Down
4 changes: 4 additions & 0 deletions packaging/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
mamonsu (3.5.9-1) stable; urgency=low
* Run on systems with latest setuptools installed (>67.7.2);
* Drop using dotted user:group specification in RPM pre-install stage;

mamonsu (3.5.8-1) stable; urgency=low
* Prepare for python 3.12: remove deprecated distutils imports;

Expand Down
6 changes: 5 additions & 1 deletion packaging/rpm/SPECS/mamonsu.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: mamonsu
Version: 3.5.8
Version: 3.5.9
Release: 1%{?dist}
Summary: Monitoring agent for PostgreSQL
Group: Applications/Internet
Expand Down Expand Up @@ -73,6 +73,10 @@ chown -R mamonsu:mamonsu /var/log/mamonsu
chown -R mamonsu:mamonsu /etc/mamonsu

%changelog
* Mon Aug 19 2024 Maxim Styushin <[email protected]> - 3.5.9-1
- Run on systems with latest setuptools installed (>67.7.2);
- Drop using dotted user:group specification in RPM pre-install stage;

* Thu Apr 18 2024 Maxim Styushin <[email protected]> - 3.5.8-1
- Prepare for python 3.12: remove deprecated distutils imports;

Expand Down
2 changes: 1 addition & 1 deletion packaging/win/mamonsu.def.nsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!define NAME Mamonsu
!define VERSION 3.5.8
!define VERSION 3.5.9
!define MAMONSU_REG_PATH "Software\PostgresPro\Mamonsu"
!define MAMONSU_REG_UNINSTALLER_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall"
!define EDB_REG "SOFTWARE\Postgresql"
Expand Down

0 comments on commit 29961c2

Please sign in to comment.