Prechádzať zdrojové kódy

Upgrade to 7.0~ynh1 (#77)

* Upgrade to 7.0

* Auto-update READMEs

* Fix character map file `UTF-8' not found

* Revert "Fix character map file `UTF-8' not found"

This reverts commit 31ff2411214e8cb565b8a75303c7358eee483bce.

* not available on bullseye

* Update tests.toml

* need 6.0

* Auto-update READMEs

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Rodolphe Robles <rodinux07@rodinux.fr>
Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
yalh76 7 mesiacov pred
rodič
commit
574c397321
4 zmenil súbory, kde vykonal 17 pridanie a 6 odobranie
  1. 1 1
      README.md
  2. 3 3
      manifest.toml
  3. 12 0
      scripts/upgrade
  4. 1 2
      tests.toml

+ 1 - 1
README.md

@@ -11,7 +11,7 @@ It shall NOT be edited by hand.
 Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services
 Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services
 
 
 [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://www.zabbix.com)
 [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://www.zabbix.com)
-[![Version: 6.4~ynh1](https://img.shields.io/badge/Version-6.4~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/zabbix/)
+[![Version: 7.0~ynh1](https://img.shields.io/badge/Version-7.0~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/zabbix/)
 
 
 <div align="center">
 <div align="center">
 <a href="https://apps.yunohost.org/app/zabbix"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>
 <a href="https://apps.yunohost.org/app/zabbix"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>

+ 3 - 3
manifest.toml

@@ -7,7 +7,7 @@ name = "Zabbix"
 description.en = "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services"
 description.en = "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services"
 description.fr = "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne"
 description.fr = "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne"
 
 
-version = "6.4~ynh1"
+version = "7.0~ynh1"
 
 
 maintainers = []
 maintainers = []
 
 
@@ -19,7 +19,7 @@ code = "https://github.com/zabbix/zabbix"
 cpe = "cpe:2.3:a:zabbix:zabbix"
 cpe = "cpe:2.3:a:zabbix:zabbix"
 
 
 [integration]
 [integration]
-yunohost = ">= 11.2.30"
+yunohost = ">= 12.0.0"
 architectures = ["amd64"]
 architectures = ["amd64"]
 multi_instance = false
 multi_instance = false
 
 
@@ -78,7 +78,7 @@ ram.runtime = "200M"
     ]
     ]
 
 
     [resources.apt.extras.zabbix]
     [resources.apt.extras.zabbix]
-    repo = "deb https://repo.zabbix.com/zabbix/6.4/debian __YNH_DEBIAN_VERSION__ main"
+    repo = "deb https://repo.zabbix.com/zabbix/7.0/debian __YNH_DEBIAN_VERSION__ main"
     key = "https://repo.zabbix.com/zabbix-official-repo.key"
     key = "https://repo.zabbix.com/zabbix-official-repo.key"
     packages = [
     packages = [
         "zabbix-server-mysql",
         "zabbix-server-mysql",

+ 12 - 0
scripts/upgrade

@@ -7,6 +7,18 @@
 source _common.sh
 source _common.sh
 source /usr/share/yunohost/helpers
 source /usr/share/yunohost/helpers
 
 
+
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression "Ensuring downward compatibility..."
+
+
+if  ynh_compare_current_package_version --comparison lt --version 6.0~ynh2; then
+    ynh_die --message="la version minimum requise pour cette version est la 6.0~ynh2, il n’est plus possible de faire une mise à jour/restauration de base de données depuis une version inférieure à la 6.0~ynh2 (commit 2ee2da0e3e8c95e90d78e234bcf2193869d115f8"
+fi
+
+
 #=================================================
 #=================================================
 # STOP SYSTEMD SERVICE
 # STOP SYSTEMD SERVICE
 #=================================================
 #=================================================

+ 1 - 2
tests.toml

@@ -18,6 +18,5 @@ test_format = 1.0
     # Commits to test upgrade from
     # Commits to test upgrade from
     # -------------------------------
     # -------------------------------
 
 
-    test_upgrade_from.8f8961c239f890069c867e40005db98465add0c9.name = "5.0.20~ynh2"
-    test_upgrade_from.2791ab29129baca48685277ce82ef763058b10cf.name = "5.0.41~ynh3"
     test_upgrade_from.2ee2da0e3e8c95e90d78e234bcf2193869d115f8.name = "6.0~ynh2"
     test_upgrade_from.2ee2da0e3e8c95e90d78e234bcf2193869d115f8.name = "6.0~ynh2"
+    test_upgrade_from.058508f95dd6b1f38bfd2808d7b5d6259656881f.name = "6.4~ynh1"