From f2fe6118f3c8494140aa13c7ab3ad4a1982b00d0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 17 Feb 2021 20:14:45 +0100 Subject: [PATCH 1/2] Upgrade to 2.2.2 --- README.md | 2 +- check_process | 4 ++++ conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0fd899c..18f064d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post - Tootdon (Android + iOS) - Tootle (iOS) -**Shipped version:** 2.2.0 +**Shipped version:** 2.2.2 ## Important points to read before installing diff --git a/check_process b/check_process index 98254d8..cc97cdd 100644 --- a/check_process +++ b/check_process @@ -47,6 +47,8 @@ upgrade=1 from_commit=e13745923a2e06e780e7b9d34ae084f600a9a2a2 # 2.1.2~ynh1 upgrade=1 from_commit=ade89203b611fd178bc9d1cf35804bc08ea3a78b + # 2.2.0~ynh1 + upgrade=1 from_commit=059ddc457aabe6962f5960612ed2dc1db53daeeb backup_restore=1 multi_instance=0 # 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. @@ -86,3 +88,5 @@ Notification=yes name=2.0.7~ynh1 ; commit=ade89203b611fd178bc9d1cf35804bc08ea3a78b name=2.1.2~ynh1 + ; commit=059ddc457aabe6962f5960612ed2dc1db53daeeb + name=2.2.0~ynh1 diff --git a/conf/arm.src b/conf/arm.src index ab1b66c..9f2de67 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165405/artifacts/download -SOURCE_SUM=1c03dac583605ff8d2d52c93f21b9a70088c0c4ba3c4b2a36b27ea5c54d8e0a4 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/175286/artifacts/download +SOURCE_SUM=d0fe56fa2686e1e19ef340077668df898a4c9c4fa8a4a2ff25e62c33825f7df3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.2.0-arm.zip +SOURCE_FILENAME=pleroma-v2.2.2-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index 77e7ecb..dabd6fc 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165407/artifacts/download -SOURCE_SUM=2bcb5836d12f46698640039b57d1b9b8917e0c59d273be2d3e2057e5ede84ef9 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download +SOURCE_SUM=dc6a210759f099219528a1d2df111110d4fbcf267d7216668f34608e7fb9f380 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.2.0-arm64.zip +SOURCE_FILENAME=pleroma-v2.2.2-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 59f31a8..f1cf9d5 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165403/artifacts/download -SOURCE_SUM=4949fb048425e4098094583e7a7cf20403fab8a9edd42d0029e99be8604ba0af +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download +SOURCE_SUM=356ac1c3a1b6253934afa298166344fe73f364669cfb44447d3126f51e01d4b0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.2.0-x86-64.zip +SOURCE_FILENAME=pleroma-v2.2.2-x86-64.zip diff --git a/manifest.json b/manifest.json index df13b1f..bd97055 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A free, federated social networking server built on open protocols.", "fr": "Un serveur de réseautage social fédéré et gratuit basé sur des protocoles ouverts." }, - "version": "2.2.0~ynh1", + "version": "2.2.2~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ From 406cdb9741728d64bc08de679eaacd0320dd3603 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 21 Feb 2021 21:35:30 +0100 Subject: [PATCH 2/2] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index cc97cdd..2de1977 100644 --- a/check_process +++ b/check_process @@ -22,7 +22,7 @@ setup_public=1 upgrade=1 # 0.9.99999 - upgrade=1 from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb + # upgrade=1 from_commit=9ec87c36793780f74365d3059d7b9d12885fbfcb # 1.1.7 # upgrade=1 from_commit=3e88dd59d8e5593fb60a86ab955aafde76abdf2e # 1.1.8