From 5a2cf86e59459e5f691ac22c2057949a19596eb3 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 3 Apr 2023 20:48:22 +0200 Subject: [PATCH 01/12] upgrade to 0.5.5 --- doc/{DISCLAIMER.md => ADMIN.md} | 0 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} | 0 manifest.toml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename doc/{DISCLAIMER.md => ADMIN.md} (100%) rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%) diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/manifest.toml b/manifest.toml index 866fdaf..c66eef8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -49,8 +49,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.4.tar.gz" - sha256 = "2dafdcf26de6c041611d16ed48b751cf8d4dfbee1f5cf4aa5975592bc080261d" + url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.5.tar.gz" + sha256 = "e09e7dff22e1d5aadb44c52d217fa53d3eaf2fece9aa9856a147987f0bbba14f" [resources.system_user] From 7db314c48199f05f6610131a5dda49b16ed2149b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 3 Apr 2023 20:57:52 +0200 Subject: [PATCH 02/12] forgot to update version in manifest x_x + fixes --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c66eef8..f61d768 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.5.4~ynh1" +version = "0.5.5~ynh1" maintainers = ["oufmilo"] @@ -20,8 +20,8 @@ code = "https://github.com/bookwyrm-social/bookwyrm" yunohost = ">= 11.1.14" architectures = "all" multi_instance = false -ldap = "not_relevant" -sso = "not_relevant" +ldap = false +sso = false disk = "50M" ram.build = "50M" ram.runtime = "50M" From 2af1468efee8442826be3bf2b4d12e5c4e7b2912 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 3 Apr 2023 20:59:14 +0200 Subject: [PATCH 03/12] new autoupdate mechanism --- .github/workflows/updater.sh | 107 ---------------------------------- .github/workflows/updater.yml | 49 ---------------- manifest.toml | 4 +- 3 files changed, 3 insertions(+), 157 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index 8e3a69d..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets="https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/$version.tar.gz" - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Let's download source tarball -asset_url=$assets - -echo "Handling asset at $asset_url" - -src="app" - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true -EOT -echo "... conf/$src.src updated" - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index a56d7cb..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/manifest.toml b/manifest.toml index f61d768..a5bc154 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.joinbookwyrm.com/" code = "https://github.com/bookwyrm-social/bookwyrm" [integration] -yunohost = ">= 11.1.14" +yunohost = ">= 11.1.16" architectures = "all" multi_instance = false ldap = false @@ -52,6 +52,8 @@ ram.runtime = "50M" url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.5.tar.gz" sha256 = "e09e7dff22e1d5aadb44c52d217fa53d3eaf2fece9aa9856a147987f0bbba14f" + autoupdate.strategy = "latest_github_tag" + [resources.system_user] [resources.install_dir] From 0306d868dfb9b6d161cd8f45dbd6be620c84c38e Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:05:09 +0200 Subject: [PATCH 04/12] add cpe and fund --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index a5bc154..3762b8f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,6 +15,8 @@ website = "https://joinbookwyrm.com/fr/" 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.1.16" From fe261a29904a33f4f5697de9eb870248b20e12ce Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:45:49 +0200 Subject: [PATCH 05/12] add test --- tests.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 0988045..9535226 100644 --- a/tests.toml +++ b/tests.toml @@ -17,4 +17,5 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.2292d0d.name = "Upgrade from 0.5.3" \ No newline at end of file + test_upgrade_from.2292d0d.name = "Upgrade from 0.5.3" + test_upgrade_from.7600f04.name = "Upgrade from 0.5.4" \ No newline at end of file From 9b6fb8cb26265628095a97465704a284aadf3458 Mon Sep 17 00:00:00 2001 From: panomaki Date: Tue, 4 Apr 2023 21:12:54 +0200 Subject: [PATCH 06/12] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 866fdaf..9f28ddd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -49,8 +49,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.5.4.tar.gz" - sha256 = "2dafdcf26de6c041611d16ed48b751cf8d4dfbee1f5cf4aa5975592bc080261d" + url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.6.0.tar.gz" + sha256 = "65d43f051ed5d6c31432511bbd98b8160c0e2e13f2dafd940ece7e71d24b9a32" [resources.system_user] From 4e94e06ccdfd31728cb785c19879c54bb042393c Mon Sep 17 00:00:00 2001 From: panomaki Date: Tue, 4 Apr 2023 21:13:15 +0200 Subject: [PATCH 07/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9f28ddd..b3c5530 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.5.4~ynh1" +version = "0.6.0~ynh1" maintainers = ["oufmilo"] From f6345cf08e784ce4a69a17458ad8a6dd21f445bd Mon Sep 17 00:00:00 2001 From: panomaki Date: Tue, 4 Apr 2023 21:13:37 +0200 Subject: [PATCH 08/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ac24aa..69ee12c 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.5.4~ynh1 +**Shipped version:** 0.6.0~ynh1 **Demo:** https://joinbookwyrm.com/fr/ From 76d929851d4c39ad10f47f4c6181947742dec6fa Mon Sep 17 00:00:00 2001 From: panomaki Date: Tue, 4 Apr 2023 21:14:00 +0200 Subject: [PATCH 09/12] Update README_fr.md --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 9bc5d36..b49ec0b 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.5.4~ynh1 +**Version incluse :** 0.6.0~ynh1 **Démo :** https://joinbookwyrm.com/fr/ @@ -47,4 +47,4 @@ ou sudo yunohost app upgrade bookwyrm -u https://github.com/YunoHost-Apps/bookwyrm_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From c87983d1722f397aacfa917cac8173d5532f89fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 6 Apr 2023 09:31:23 +0000 Subject: [PATCH 10/12] Auto-update README --- README.md | 14 +------------- README_fr.md | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 65bb8ae..7848a5e 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.5.4~ynh1 +**Shipped version:** 0.5.5~ynh1 **Demo:** https://joinbookwyrm.com/fr/ @@ -27,18 +27,6 @@ BookWyrm is a social network for tracking your reading, talking about books, wri ![Screenshot of BookWyrm](./doc/screenshots/screenshot-bookwyrm.jpg) -## Disclaimers / important information - -This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production. - -Generate the admin code with ``` sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code```, and copy the admin code to use when you create your admin account. You can get your code at any time by re-running that command. Here's an example output: - -``` bash -******************************************* -Use this code to create your admin account: -c6c35779-af3a-4091-b330-c026610920d6 -******************************************* -``` ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 25b9ed4..ab478d5 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.5.4~ynh1 +**Version incluse :** 0.5.5~ynh1 **Démo :** https://joinbookwyrm.com/fr/ @@ -27,18 +27,6 @@ BookWyrm est un réseau social pour garder la trace de vos lectures, parler de l ![Capture d’écran de BookWyrm](./doc/screenshots/screenshot-bookwyrm.jpg) -## Avertissements / informations importantes - -Ce projet est encore jeune et n'est pas, pour le moment, très stable, faites preuve de prudence lors de son utilisation en production. - -Générez le code administrateur avec ``` sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code```, et copiez le code administrateur à utiliser lors de la création de votre compte administrateur. Vous pouvez obtenir votre code à tout moment en réexécutant cette commande. Voici un exemple de sortie : - -```bash -******************************************* -Use this code to create your admin account: -c6c35779-af3a-4091-b330-c026610920d6 -******************************************* -``` ## Documentations et ressources * Site officiel de l’app : From 82f50885e1f909ed6da2b3494aff559d6958f206 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 7 Apr 2023 12:32:29 +0000 Subject: [PATCH 11/12] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4258d07..69ee12c 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,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.0~ynh1 **Demo:** https://joinbookwyrm.com/fr/ diff --git a/README_fr.md b/README_fr.md index dfbf13a..121710a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,6 +18,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.0~ynh1 **Démo :** https://joinbookwyrm.com/fr/ @@ -46,4 +47,4 @@ ou sudo yunohost app upgrade bookwyrm -u https://github.com/YunoHost-Apps/bookwyrm_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From a9a7a681cc5872ac952d4dcd8bd7357f8a092b80 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 7 Apr 2023 19:41:54 +0200 Subject: [PATCH 12/12] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6bb9e8b..f6ee5d6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,6 +67,7 @@ ynh_script_progression --message="Upgrading database..." --weight=1 $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 #=================================================