From c04e4d254f36298163dd85c85035e3bca13951d4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 27 Jan 2022 19:05:44 +0100 Subject: [PATCH 1/8] 2.8.0 --- 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 9280981..11c96a9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/discourse/discourse/archive/v2.7.13.tar.gz -SOURCE_SUM=29905c395311844fb3dacbbc11de37d3147ec45fc6c5f0a68b5d8ea98a2bc364 +SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.0.tar.gz +SOURCE_SUM=0084405922fdbeb4d027c5d3b3bf885330d008e49756eb5c2761192d6f96571b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 33a0d28..6d0bb33 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discussion platform", "fr": "Plateforme de discussion" }, - "version": "2.7.13~ynh1", + "version": "2.8.0~ynh1", "url": "http://Discourse.org", "upstream": { "license": "GPL-2.0", From 1e25f93466a9b1d2bbca22c459d6c7dec8e45ade Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 27 Jan 2022 18:05:50 +0000 Subject: [PATCH 2/8] 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 977eca6..2a11867 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Discourse is modern forum software for your community. Use it as a mailing list, discussion forum, long-form chat room, and more! -**Shipped version:** 2.7.13~ynh1 +**Shipped version:** 2.8.0~ynh1 **Demo:** https://try.discourse.org diff --git a/README_fr.md b/README_fr.md index 25d3fc7..0a72faf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le comme liste de diffusion, forum de discussion, salle de discussion longue durée, et plus encore ! -**Version incluse :** 2.7.13~ynh1 +**Version incluse :** 2.8.0~ynh1 **Démo :** https://try.discourse.org From 541f9ce7c880bb5f595436fc701bdf49a300256d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 27 Jan 2022 19:10:42 +0100 Subject: [PATCH 3/8] Update check_process --- check_process | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index fcc1533..105e63b 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.6.1~ynh2 - upgrade=1 from_commit=c626379c98bb7f052061446cd152e4406979d49d + # 2.7.13 + upgrade=1 from_commit=0a9ab8ee823c7ef6602f80374cb396bac6487760 backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! multi_instance=0 @@ -23,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=c626379c98bb7f052061446cd152e4406979d49d - name=2.6.1~ynh2 + ; commit=0a9ab8ee823c7ef6602f80374cb396bac6487760 + name=2.7.13 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& From fbf5ec199d9a9168533dd83dec4754afc22ebe71 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 27 Jan 2022 22:16:00 +0100 Subject: [PATCH 4/8] Delete app-4-fix-missing-git-repository.patch --- .../app-4-fix-missing-git-repository.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 sources/patches/app-4-fix-missing-git-repository.patch diff --git a/sources/patches/app-4-fix-missing-git-repository.patch b/sources/patches/app-4-fix-missing-git-repository.patch deleted file mode 100644 index c02d177..0000000 --- a/sources/patches/app-4-fix-missing-git-repository.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/discourse.rb b/lib/discourse.rb -index 2b53a91eb3..eec55647d5 100644 ---- a/lib/discourse.rb -+++ b/lib/discourse.rb -@@ -439,7 +439,7 @@ module Discourse - $full_version ||= - begin - git_cmd = 'git describe --dirty --match "v[0-9]*"' -- self.try_git(git_cmd, 'unknown') -+ self.try_git(git_cmd, Discourse::VERSION::STRING) - end - end - -@@ -448,7 +448,7 @@ module Discourse - $last_commit_date ||= - begin - git_cmd = 'git log -1 --format="%ct"' -- seconds = self.try_git(git_cmd, nil) -+ seconds = '1563199245' # Note(decentral1se): Output from actual command in the v2.3.2 branch - seconds.nil? ? nil : DateTime.strptime(seconds, '%s') - end - end From 429cc92944b7dd2c2014fcaa9b2adff768adad9c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 27 Jan 2022 22:44:56 +0100 Subject: [PATCH 5/8] Revert "Delete app-4-fix-missing-git-repository.patch" This reverts commit fbf5ec199d9a9168533dd83dec4754afc22ebe71. --- .../app-4-fix-missing-git-repository.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 sources/patches/app-4-fix-missing-git-repository.patch diff --git a/sources/patches/app-4-fix-missing-git-repository.patch b/sources/patches/app-4-fix-missing-git-repository.patch new file mode 100644 index 0000000..c02d177 --- /dev/null +++ b/sources/patches/app-4-fix-missing-git-repository.patch @@ -0,0 +1,22 @@ +diff --git a/lib/discourse.rb b/lib/discourse.rb +index 2b53a91eb3..eec55647d5 100644 +--- a/lib/discourse.rb ++++ b/lib/discourse.rb +@@ -439,7 +439,7 @@ module Discourse + $full_version ||= + begin + git_cmd = 'git describe --dirty --match "v[0-9]*"' +- self.try_git(git_cmd, 'unknown') ++ self.try_git(git_cmd, Discourse::VERSION::STRING) + end + end + +@@ -448,7 +448,7 @@ module Discourse + $last_commit_date ||= + begin + git_cmd = 'git log -1 --format="%ct"' +- seconds = self.try_git(git_cmd, nil) ++ seconds = '1563199245' # Note(decentral1se): Output from actual command in the v2.3.2 branch + seconds.nil? ? nil : DateTime.strptime(seconds, '%s') + end + end From ab82fbe7b2507c3f89c1bcfa485830c0ba34f43c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 9 Feb 2022 00:08:01 +0100 Subject: [PATCH 6/8] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8de55b6..332bb05 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ pkg_dependencies="g++ libjemalloc1|libjemalloc2 libjemalloc-dev zlib1g-dev libreadline-dev libpq-dev libssl-dev libyaml-dev libcurl4-dev libapr1-dev libxslt1-dev libxml2-dev vim imagemagick postgresql postgresql-server-dev-all postgresql-contrib optipng jhead jpegoptim gifsicle brotli" -RUBY_VERSION="2.7.1" +RUBY_VERSION="2.7.2" #================================================= # PERSONAL HELPERS From 84b5cba190e3611d15fc68c5ecad21ac1573713b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 1 Mar 2022 17:21:37 +0100 Subject: [PATCH 7/8] 2.8.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 11c96a9..37eede2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.0.tar.gz -SOURCE_SUM=0084405922fdbeb4d027c5d3b3bf885330d008e49756eb5c2761192d6f96571b +SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.1.tar.gz +SOURCE_SUM=5b86174240cdb0dc86f3e72d3ea6a084af3cd28762e17d4ce5237cdaa96c87fa SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 6d0bb33..7d0d5c9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discussion platform", "fr": "Plateforme de discussion" }, - "version": "2.8.0~ynh1", + "version": "2.8.1~ynh1", "url": "http://Discourse.org", "upstream": { "license": "GPL-2.0", From 7a55173297ef1580484761c1e1ac4cb356dec9cb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 1 Mar 2022 17:29:15 +0100 Subject: [PATCH 8/8] Update install --- scripts/install | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 3820082..e8ab9ca 100644 --- a/scripts/install +++ b/scripts/install @@ -65,8 +65,8 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies 2>/dev/null -ynh_install_ruby --ruby_version=$RUBY_VERSION 2>/dev/null +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION #================================================= # CREATE DEDICATED USER @@ -83,11 +83,9 @@ ynh_script_progression --message="Creating a PostgreSQL database..." db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name -db_pwd=$(ynh_string_random) ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_psql_setup_db --db_user=$db_user --db_name=$db_name # Set extensions ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS hstore;" --database=$db_name ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name