From 7e44ae48ebcafa3eef704b38105d4880d845c2ff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 21 Oct 2022 08:13:11 +0000 Subject: [PATCH 1/5] Upgrade to version 6.0.3 --- conf/app.src | 7 ++- manifest.json | 141 ++++++++++++++++++++++++++------------------------ 2 files changed, 76 insertions(+), 72 deletions(-) diff --git a/conf/app.src b/conf/app.src index e7d356f..b7e79a4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://wordpress.org/wordpress-6.0.2.tar.gz -SOURCE_SUM=506e45625268c01cbbd432478280c4d7f948227769d2ac75c8594321e315d0e8 +SOURCE_URL=https://downloads.wordpress.org/release/wordpress-6.0.3.zip +SOURCE_SUM=3029a0d004e4951b85e6954c89400801c4954ba76aab4835360d339bfe1fc562 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 00b9b3d..1f8afc0 100644 --- a/manifest.json +++ b/manifest.json @@ -1,82 +1,87 @@ { - "name": "WordPress", - "id": "wordpress", - "packaging_format": 1, - "description": { - "en": "Create a beautiful blog or website easily", - "fr": "Logiciel de création de blog ou de site Web" - }, - "version": "6.0.2~ynh2", - "url": "https://wordpress.org/", - "upstream": { + "name": "WordPress", + "id": "wordpress", + "packaging_format": 1, + "description": { + "en": "Create a beautiful blog or website easily", + "fr": "Logiciel de création de blog ou de site Web" + }, + "version": "6.0.3~ynh1", + "url": "https://wordpress.org/", + "upstream": { "license": "GPL-2.0", "website": "https://wordpress.org/", "admindoc": "https://codex.wordpress.org/", "code": "https://core.trac.wordpress.org/browser", "cpe": "cpe:2.3:a:wordpress:wordpress" }, - "license": "GPL-2.0", - "maintainer": { - "name": "kay0u", - "email": "pierre@kayou.io" - }, - "previous_maintainers": [{ - "name": "Maniack Crudelis", - "email": "maniackc_dev@crudelis.fr" - }], + "license": "GPL-2.0", + "maintainer": { + "name": "kay0u", + "email": "pierre@kayou.io" + }, + "previous_maintainers": [ + { + "name": "Maniack Crudelis", + "email": "maniackc_dev@crudelis.fr" + } + ], "requirements": { "yunohost": ">= 11.0.9" }, - "multi_instance": true, - "services": [ - "nginx", - "php8.0-fpm", - "mysql" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/blog", - "default": "/blog" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, - { - "name": "language", - "type": "string", - "ask": { + "multi_instance": true, + "services": [ + "nginx", + "php8.0-fpm", + "mysql" + ], + "arguments": { + "install": [ + { + "name": "domain", + "type": "domain" + }, + { + "name": "path", + "type": "path", + "example": "/blog", + "default": "/blog" + }, + { + "name": "is_public", + "type": "boolean", + "default": true + }, + { + "name": "language", + "type": "string", + "ask": { "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["en_US", "fr_FR"], - "default": "en_US" - }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose the WordPress administrator (must be an existing YunoHost user)", - "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" - } - }, - { - "name": "multisite", - "type": "boolean", - "ask": { - "en": "Enable multisite option?", - "fr": "Activer l'option multisite ?" - }, - "default": false - } - ] - } + "choices": [ + "en_US", + "fr_FR" + ], + "default": "en_US" + }, + { + "name": "admin", + "type": "user", + "ask": { + "en": "Choose the WordPress administrator (must be an existing YunoHost user)", + "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" + } + }, + { + "name": "multisite", + "type": "boolean", + "ask": { + "en": "Enable multisite option?", + "fr": "Activer l'option multisite ?" + }, + "default": false + } + ] + } } From 6235b63248c765742a8c663fe8946082a549d0bf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 21 Oct 2022 20:12:04 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f1fc654..fd4c2c2 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 6.0.2~ynh2 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/wordpress_ynh/tree/master) used in the catalog is currently on version 6.0.2\~ynh1.)* - +**Shipped version:** 6.0.3~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a7b8f75..ff79315 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,8 +19,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.0.2~ynh2 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/wordpress_ynh/tree/master) utilisée dans le catalogue est actuellement en 6.0.2\~ynh1.)* - +**Version incluse :** 6.0.3~ynh1 ## Captures d'écran From e98eb4565c52a82b42c513859459d92ee2c3762d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 24 Oct 2022 23:30:09 +0200 Subject: [PATCH 3/5] Fix auto-updater --- .github/workflows/updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.py b/.github/workflows/updater.py index b655132..002368b 100755 --- a/.github/workflows/updater.py +++ b/.github/workflows/updater.py @@ -105,7 +105,7 @@ def main(): return # Proceed only if a PR for this new version does not already exist - branch = f"ci-auto-update-v${latest_version}" + branch = f"ci-auto-update-v{latest_version}" command = ["git", "ls-remote", "--exit-code", "-h", repo, branch] if run(command, stderr=PIPE, stdout=PIPE, check=False).returncode == 0: logging.warning("A branch already exists for this update") From ff9132676df76340f41b0d7899b5a06587c7d7cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Nov 2022 08:09:52 +0000 Subject: [PATCH 4/5] Upgrade to version 6.1.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b7e79a4..78351f6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://downloads.wordpress.org/release/wordpress-6.0.3.zip -SOURCE_SUM=3029a0d004e4951b85e6954c89400801c4954ba76aab4835360d339bfe1fc562 +SOURCE_URL=https://downloads.wordpress.org/release/wordpress-6.1.1.zip +SOURCE_SUM=088280b34aebc7331693e729d8e6b05eb8b9998c001a74caa9aaa1e09b5c3617 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1f8afc0..63acda1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create a beautiful blog or website easily", "fr": "Logiciel de création de blog ou de site Web" }, - "version": "6.0.3~ynh1", + "version": "6.1.1~ynh1", "url": "https://wordpress.org/", "upstream": { "license": "GPL-2.0", From db05bc2033d30495a38a4c5451239616f4afe09f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Nov 2022 08:10:03 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fd4c2c2..bc39f16 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 6.0.3~ynh1 +**Shipped version:** 6.1.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ff79315..0841329 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.0.3~ynh1 +**Version incluse :** 6.1.1~ynh1 ## Captures d'écran