From 0266fa43ae8fe8f6e0dabbe953e29a5a5d773616 Mon Sep 17 00:00:00 2001 From: Thomas Parisot Date: Mon, 21 Dec 2020 13:28:26 +0100 Subject: [PATCH 1/7] Reference mobilizon@1.0.3 --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 6c7df20..6bbab02 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.0.0/mobilizon-1.0.0.tar.gz -SOURCE_SUM=a66712b859b923403945ad3e1e05f3ef537c7eb2a598f511dd99018ee4c06feb +SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.0.3/mobilizon-1.0.3.tar.gz +SOURCE_SUM=5fe588f3567a90c82be8ac1289f836ee2b98b446033c1ca8f9293fd2145441c5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mobilizon-1.0.0.tar.gz +SOURCE_FILENAME=mobilizon-1.0.3.tar.gz From dc58eea5f918b264bb13508f7efdcaebad67cc50 Mon Sep 17 00:00:00 2001 From: Thomas Parisot Date: Mon, 21 Dec 2020 13:30:46 +0100 Subject: [PATCH 2/7] Require node.js 14, for more efficient build --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index da4bfa5..9c7a7b7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ pkg_dependencies="build-essential inotify-tools postgresql postgresql-client postgresql-contrib postgis postgresql-postgis-scripts git curl unzip gnupg openssl make gcc libc-dev argon2 imagemagick webp gifsicle jpegoptim optipng pngquant cmake" extra_pkg_dependencies="elixir esl-erlang" -NODEJS_VERSION=12 +NODEJS_VERSION=14 #================================================= # PERSONAL HELPERS From ea39916a76f3b2c61cb69b512357516ad3c1c73c Mon Sep 17 00:00:00 2001 From: Thomas Parisot Date: Mon, 21 Dec 2020 13:50:58 +0100 Subject: [PATCH 3/7] Run v1.0.3 app migration --- scripts/upgrade | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 14fcdfe..5b89a4f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -226,6 +226,19 @@ pushd $final_path/$app sudo -u "$app" MIX_ENV=prod mix ecto.migrate popd +#================================================= +# RUN APP MIGRATIONS +#================================================= + +if ynh_version_gt "1.0.3~ynh1" "${previous_version}" ; then + +ynh_script_progression --message="Mobilizon v1.0.3: Refresh remote profiles to save avatars locally" +pushd $final_path/$app + sudo -u "$app" MIX_ENV=prod mix mobilizon.actors.refresh --all +popd + +fi + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= From 7ad05df44ff35fd7a373b5a28f49ffed706e0b4e Mon Sep 17 00:00:00 2001 From: Thomas Parisot Date: Mon, 21 Dec 2020 13:51:45 +0100 Subject: [PATCH 4/7] Bump version to `1.0.3~ynh1` --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8e832cf..52aafdb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "1.0.0~ynh1", + "version": "1.0.3~ynh1", "url": "https://joinmobilizon.org/", "license": "AGPL-3.0-or-later", "maintainer": { From 3ac90d9b1680a3b7d80539c6e8f12d3c950b5e6d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 21 Dec 2020 21:03:02 +0100 Subject: [PATCH 5/7] Remove old NodeJS version --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 5b89a4f..53d0e38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -178,6 +178,11 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +if ynh_version_gt "1.0.3~ynh1" "${previous_version}" ; then + ynh_script_progression --message="Mobilizon v1.0.3: Remove previous NodeJS" + ynh_remove_nodejs +fi + ynh_install_nodejs --nodejs_version=$NODEJS_VERSION lsb_name="$(lsb_release --codename --short)" From 84df991679e54ad1223b58f6c08ac55a13c3e2f1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 21 Dec 2020 21:03:58 +0100 Subject: [PATCH 6/7] Formating --- scripts/upgrade | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 53d0e38..bda742f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -236,12 +236,10 @@ popd #================================================= if ynh_version_gt "1.0.3~ynh1" "${previous_version}" ; then - -ynh_script_progression --message="Mobilizon v1.0.3: Refresh remote profiles to save avatars locally" -pushd $final_path/$app - sudo -u "$app" MIX_ENV=prod mix mobilizon.actors.refresh --all -popd - + ynh_script_progression --message="Mobilizon v1.0.3: Refresh remote profiles to save avatars locally" + pushd $final_path/$app + sudo -u "$app" MIX_ENV=prod mix mobilizon.actors.refresh --all + popd fi #================================================= From e4a0850857598c3bbf52492318e93579cb18a1e1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 21 Dec 2020 21:05:39 +0100 Subject: [PATCH 7/7] Check upgrade from 1.0.0~ynh1 --- check_process | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 34b50c5..4a80164 100644 --- a/check_process +++ b/check_process @@ -18,6 +18,8 @@ upgrade=1 from_commit=185cc16e516076e340cca149e8e9140a8762e22e # 0.1.0-2019-12-28~ynh1 upgrade=1 from_commit=6b77f268d4e7e2cd525e11e11f3ed5a5162d0bd2 + # 1.0.0~ynh1 + upgrade=1 from_commit=ac87692da6eaff71f40e3069c7bc6129eddba5e6 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -35,4 +37,5 @@ Notification=all name=0.1.0-2019-05-15~ynh1 ; commit=6b77f268d4e7e2cd525e11e11f3ed5a5162d0bd2 name=0.1.0-2019-12-28~ynh1 - + ; commit=ac87692da6eaff71f40e3069c7bc6129eddba5e6 + name=1.0.0~ynh1