From 31a0693e62caa3494c72e0d163e251c79c98de1a Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:39:37 +0100 Subject: [PATCH 1/4] Testing (#109) * Update manifest.toml * Upgrade to v2024.2.6 (#108) --------- Co-authored-by: YunoHost Bot --- manifest.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index c24fcfa..3b66462 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,8 +23,11 @@ code = "https://github.com/dokuwiki/dokuwiki" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = true + disk = "50M" ram.build = "200M" ram.runtime = "50M" @@ -55,8 +58,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/dokuwiki/dokuwiki/releases/download/release-2023-04-04a/dokuwiki-2023-04-04a.tgz" - sha256 = "153c99cf42b9068b1ec21a2c765b862a44b374ad2f1a39223f5511a982b160bb" + url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06.tar.gz" + sha256 = "fa5d890587d90e808402a95b581ccd173765045df23bd48f834b09a9df7252ed" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 0aeb93ab5185af9970ba853dfd076ff55f49b8a6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Mar 2024 21:39:43 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c17d1d5..d0fba81 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -54,4 +54,4 @@ or sudo yunohost app upgrade dokuwiki -u https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 3d90b67..3f7c2f2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ From 21f964222f641731668e7f1aa4c3f38acee9e206 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:59:35 +0100 Subject: [PATCH 3/4] chore: use latest dokuwiki hotfix version 2024-02-06a --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3b66462..da552d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -8,9 +8,9 @@ description.de = "Standardkonformes, einfach zu benutzendes Wiki und zielt haupt description.es = "Sistema de Wiki de uso sencillicimo y compatible con los estándares" description.it = "Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo" -version = "2023.04.04a~ynh2" +version = "2024-02-06a~ynh1" -maintainers = ["Gofannon"] +maintainers = [""] [upstream] license = "GPL-2.0-or-later" @@ -58,8 +58,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06.tar.gz" - sha256 = "fa5d890587d90e808402a95b581ccd173765045df23bd48f834b09a9df7252ed" + url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06a.tar.gz" + sha256 = "3d025174169bb15be36b934f63974772b8caa9ea23e1b0c93f897396642b1697" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f078898234a661fd0fa036854fe40c9b3f8a6120 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:18:25 +0100 Subject: [PATCH 4/4] chore(linter): fix linter warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ! manifest ✘ The 'version' field should match the format ~ynh. For example: 4.3-2~ynh3. ..... --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index da552d1..19834f3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -8,7 +8,7 @@ description.de = "Standardkonformes, einfach zu benutzendes Wiki und zielt haupt description.es = "Sistema de Wiki de uso sencillicimo y compatible con los estándares" description.it = "Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo" -version = "2024-02-06a~ynh1" +version = "2024.02.06a~ynh1" maintainers = [""]