diff --git a/README.md b/README.md index 9d200e7..749c139 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. -**Shipped version:** 0.6.6~ynh2 +**Shipped version:** 0.7.1~ynh1 **Demo:** https://joinbookwyrm.com/fr/ diff --git a/README_fr.md b/README_fr.md index 2f5d09a..d188675 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po BookWyrm est un réseau social pour garder la trace de vos lectures, parler de livres, écrire des critiques et découvrir quoi lire ensuite. -**Version incluse :** 0.6.6~ynh2 +**Version incluse :** 0.7.1~ynh1 **Démo :** https://joinbookwyrm.com/fr/ diff --git a/manifest.toml b/manifest.toml index fa28d52..2cc9fbf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookWyrm" description.en = "Platform for social reading" description.fr = "Plateforme de lecture sociale" -version = "0.6.6~ynh2" +version = "0.7.1~ynh1" maintainers = ["oufmilo"] @@ -16,7 +16,6 @@ demo = "https://joinbookwyrm.com/fr/" admindoc = "https://docs.joinbookwyrm.com/" code = "https://github.com/bookwyrm-social/bookwyrm" cpe = "cpe:2.3:a:joinbookwyrm:bookwyrm" -fund = ["https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"] [integration] yunohost = ">= 11.2" @@ -50,8 +49,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.6.6.tar.gz" - sha256 = "e19b802e5ebcbaeb979f174f8f7fbd23690acee9000468a48016118257df5939" + url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz" + sha256 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e" autoupdate.strategy = "latest_github_tag" diff --git a/scripts/install b/scripts/install index 381ed38..a7ea36f 100755 --- a/scripts/install +++ b/scripts/install @@ -43,10 +43,12 @@ $install_dir/venv/bin/pip3 install -r "$install_dir/requirements.txt" #================================================= ynh_script_progression --message="Initializing database..." --weight=1 +pushd $install_dir $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate $install_dir/venv/bin/python3 "$install_dir/manage.py" initdb $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input +popd #================================================= # NGINX CONFIGURATION @@ -97,7 +99,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process" ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid" ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready" diff --git a/scripts/restore b/scripts/restore index 0113f4b..f354e6c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,7 +67,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process" ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid" ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready" diff --git a/scripts/upgrade b/scripts/upgrade index 660b18c..ce7ec22 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,9 +32,9 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --action="stop" --service_name="bookwyrm-beat" --log_path="systemd" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="bookwyrm-server" --log_path="systemd" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="bookwyrm-worker" --log_path="systemd" --line_match="Stopped" +ynh_systemd_action --action="stop" --service_name="bookwyrm-beat" --log_path="systemd" +ynh_systemd_action --action="stop" --service_name="bookwyrm-server" --log_path="systemd" +ynh_systemd_action --action="stop" --service_name="bookwyrm-worker" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -77,11 +77,11 @@ $install_dir/venv/bin/pip3 install -r "$install_dir/requirements.txt" #================================================= ynh_script_progression --message="Upgrading database..." --weight=1 +pushd $install_dir $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input -$install_dir/venv/bin/python3 "$install_dir/manage.py" populate_streams -$install_dir/venv/bin/python3 "$install_dir/manage.py" makemigrations --merge --noinput $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate +popd #================================================= # SET PERMISSIONS ON BOOKWYRM DIRECTORY @@ -125,7 +125,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process" ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid" ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready" diff --git a/tests.toml b/tests.toml index 435ba2e..2f1968a 100644 --- a/tests.toml +++ b/tests.toml @@ -16,6 +16,7 @@ test_format = 1.0 # ------------------------------- # Commits to test upgrade from # ------------------------------- - - test_upgrade_from.7600f04.name = "Upgrade from 0.5.4" - test_upgrade_from.d291f0e.name = "Upgrade from 0.6.4" + + test_upgrade_from.7600f04.name = "0.5.4" + test_upgrade_from.d291f0e.name = "0.6.4" + test_upgrade_from.749f46f.name = "0.6.6"