From 723f3d68321811f68b0a3e6545ccaad3e3b4cf09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:35:18 +0100 Subject: [PATCH 1/5] Fix typos --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index f25b0b8..b5d4e60 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "pleroma", "packaging_format": 1, "description": { - "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." + "en": "Federated social networking server built on open protocols", + "fr": "Serveur de réseautage social fédéré basé sur des protocoles ouverts" }, "version": "2.4.4~ynh1", "url": "https://pleroma.social/", @@ -65,7 +65,7 @@ "name": "registration", "type": "boolean", "ask": { - "en": "Should registration be open to users who do not have a Yunohost account on the system?", + "en": "Should registration be open to users who do not have a YunoHost account on the system?", "fr": "L'inscription doit-elle être ouverte aux utilisateurs qui n'ont pas de compte YunoHost sur le système ?" }, "default": false From 79f1bca56678704720803bfa7b150c60eacd4fc3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 1 Dec 2022 21:47:20 +0100 Subject: [PATCH 2/5] Upgrade auto-updater dependencies --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 6f3c1b9..64f2a2f 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 }} From 783190191be2bd54015ce0d60965347c5bba3956 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 17:10:03 +0000 Subject: [PATCH 3/5] Upgrade to v2.4.5 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 23e1016..ad400ff 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220705/artifacts/download?file_type=archive -SOURCE_SUM=8b4e2ab17362c7b0ed3ca685e19d578ad842ac00cde2db7d8c54dfd5a4e05891 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224375/artifacts/download?file_type=archive +SOURCE_SUM=6e2d055795f1f59bbdadf82bfd4ae291e89ac6a65a71091657359cd7eae783d4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index d32a5f8..842af44 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220709/artifacts/download?file_type=archive -SOURCE_SUM=e432310df95ae4d915a02082252df0346ca7e112ffa4484b6a05075778c71338 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224379/artifacts/download?file_type=archive +SOURCE_SUM=4c98198401787797681bbc755450a23eb8113420cd4f55f27b980d11378c884e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index 1e5b02f..e3fd01f 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220707/artifacts/download?file_type=archive -SOURCE_SUM=c31dd8bb62728887cfe5488ef5818dc5e57e90f6443fbcfd501ea12044d0a94c +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224377/artifacts/download?file_type=archive +SOURCE_SUM=f64d43f86f962fa4a03a2a3108c0cf353ec8f80a5e8b59098470356048a6fdd0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b5d4e60..5034d53 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Federated social networking server built on open protocols", "fr": "Serveur de réseautage social fédéré basé sur des protocoles ouverts" }, - "version": "2.4.4~ynh1", + "version": "2.4.5~ynh1", "url": "https://pleroma.social/", "upstream": { "license": "AGPL-3.0-only", From 054898fa349e96c7a46005e92bbe02a22c2e1479 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 17:10:10 +0000 Subject: [PATCH 4/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 315d5a1..47de0ff 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Shipped version:** 2.4.4~ynh1 +**Shipped version:** 2.4.5~ynh1 **Demo:** http://distsn.org/pleroma-instances.html diff --git a/README_fr.md b/README_fr.md index 0a94eae..d63eeab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web -**Version incluse :** 2.4.4~ynh1 +**Version incluse :** 2.4.5~ynh1 **Démo :** http://distsn.org/pleroma-instances.html From 3d02f4fefdc80fcb2e48c0bac0ab0f25f2d48560 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 21 Dec 2022 18:11:07 +0100 Subject: [PATCH 5/5] Fix auto-updater (#221) --- .github/workflows/updater.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index d9c9a1b..76b7599 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -36,7 +36,9 @@ echo "Current version: $current_version" echo "Latest release from upstream: $version" echo "VERSION=$version" >> $GITHUB_ENV echo "RELEASE=$release" >> $GITHUB_ENV -echo "DESCRIPTION=$description" >> $GITHUB_ENV +echo "DESCRIPTION<> $GITHUB_ENV +echo "$description" >> $GITHUB_ENV +echo "EOF" >> $GITHUB_ENV # For the time being, let's assume the script will fail echo "PROCEED=false" >> $GITHUB_ENV @@ -70,7 +72,7 @@ for arch in ${architectures[@]}; do tempdir="$(mktemp -d)" # Download sources and calculate checksum - filename=${asset_url##*/} + filename="asset-$arch.zip" curl --silent -4 -L $asset_url -o "$tempdir/$filename" checksum=$(sha256sum "$tempdir/$filename" | head -c 64)