diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} diff --git a/README.md b/README.md index 4dd8f5e..d9832d6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Mastodon for YunoHost [![Integration level](https://dash.yunohost.org/integration/mastodon.svg)](https://dash.yunohost.org/appci/app/mastodon) ![Working status](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) + [![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) *[Lire ce readme en français.](./README_fr.md)* @@ -17,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 4.0.2~ynh2 +**Shipped version:** 4.1.2~ynh1 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index 508e70d..98f83f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Mastodon pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/mastodon.svg)](https://dash.yunohost.org/appci/app/mastodon) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) + [![Installer Mastodon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) *[Read this readme in english.](./README.md)* @@ -18,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse :** 4.0.2~ynh2 +**Version incluse :** 4.1.2~ynh1 **Démo :** https://joinmastodon.org/ diff --git a/check_process b/check_process index eda9f29..8714241 100644 --- a/check_process +++ b/check_process @@ -12,16 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 3.4.1~ynh1 - #upgrade=1 from_commit=efbdbb05350b820c6e59a7bbbf70f57cf679fff8 - # 3.4.1~ynh4 - #upgrade=1 from_commit=adec07db890dec787416e1b7c4493d24391d3500 - # 3.4.4~ynh1 - #upgrade=1 from_commit=4d413848bf444586e28f3658de0ebe36d6ebf059 - # 3.5.3~ynh1 - upgrade=1 from_commit=acdc124f76fb9724cb22acb18c45cf0c3c2e62b5 - # 3.5.3~ynh3 - upgrade=1 from_commit=efa2d628920edce255ff406b28a97b1dd20e3d74 + # 4.02~ynh2 + upgrade=1 from_commit=94381183ca2d14da72234b53c9a83972ffb16e54 backup_restore=1 multi_instance=0 change_url=0 diff --git a/conf/app.src b/conf/app.src index dbf6513..7df3b2a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.0.2.tar.gz -SOURCE_SUM=70a4d9dcd9b746f6e9ced9b567ee5ad81e530cfaccb7f471259b917c20166309 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.1.2.tar.gz +SOURCE_SUM=12837c7b57acc11ebd24b23a270500c8917459ecdc2a841ba452296b02bcaf29 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 871809b..8abc517 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "4.0.2~ynh2", + "version": "4.1.2~ynh1", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index 1b9fd22..8fb5cec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git build_pkg_dependencies="" memory_needed="2560" -ruby_version=3.0.3 +ruby_version=3.0.6 nodejs_version=16 # Workaround for Mastodon on Bullseye diff --git a/sources/patches/app-blurhash-bugfix.patch b/sources/patches/app-blurhash-bugfix.patch deleted file mode 100644 index e75702b..0000000 --- a/sources/patches/app-blurhash-bugfix.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Gemfile b/Gemfile -index 7c36bc6b8..3f691d102 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -22,7 +22,8 @@ - gem 'fog-core', '<= 2.1.0' - gem 'fog-openstack', '~> 0.3', require: false - gem 'kt-paperclip', '~> 7.1' --gem 'blurhash', '~> 0.1' -+gem 'blurhash', github: 'Gargron/blurhash', ref: '870a34e01ce7d09a7bd4d700435e1764ca823246' -+ - - gem 'active_model_serializers', '~> 0.10' - gem 'addressable', '~> 2.8' - -diff --git a/Gemfile.lock b/Gemfile.lock -index 7c36bc6b8..3f691d102 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -7,6 +7,13 @@ - hkdf (~> 0.2) - jwt (~> 2.0) - -+GIT -+ remote: https://github.com/Gargron/blurhash.git -+ revision: 870a34e01ce7d09a7bd4d700435e1764ca823246 -+ ref: 870a34e01ce7d09a7bd4d700435e1764ca823246 -+ specs: -+ blurhash (0.1.6) -+ - GEM - remote: https://rubygems.org/ - specs: -@@ -120,8 +127,6 @@ - bindata (2.4.10) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) -- blurhash (0.1.6) -- ffi (~> 1.14) - bootsnap (1.13.0) - msgpack (~> 1.2) - brakeman (5.3.1) -@@ -448,7 +453,7 @@ - openssl-signature_algorithm (1.2.1) - openssl (> 2.0, < 3.1) - orm_adapter (0.5.0) -- ox (2.14.11) -+ ox (2.14.13) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) -@@ -738,7 +743,7 @@ - aws-sdk-s3 (~> 1.114) - better_errors (~> 2.9) - binding_of_caller (~> 1.0) -- blurhash (~> 0.1) -+ blurhash! - bootsnap (~> 1.13.0) - brakeman (~> 5.3) - browser