mirror of
https://github.com/YunoHost-Apps/pleroma_ynh.git
synced 2024-09-03 20:15:59 +02:00
Merge branch 'testing' into take-account-registration
This commit is contained in:
commit
f8f6f0e501
8 changed files with 18 additions and 16 deletions
6
.github/workflows/updater.sh
vendored
6
.github/workflows/updater.sh
vendored
|
@ -36,7 +36,9 @@ echo "Current version: $current_version"
|
||||||
echo "Latest release from upstream: $version"
|
echo "Latest release from upstream: $version"
|
||||||
echo "VERSION=$version" >> $GITHUB_ENV
|
echo "VERSION=$version" >> $GITHUB_ENV
|
||||||
echo "RELEASE=$release" >> $GITHUB_ENV
|
echo "RELEASE=$release" >> $GITHUB_ENV
|
||||||
echo "DESCRIPTION=$description" >> $GITHUB_ENV
|
echo "DESCRIPTION<<EOF" >> $GITHUB_ENV
|
||||||
|
echo "$description" >> $GITHUB_ENV
|
||||||
|
echo "EOF" >> $GITHUB_ENV
|
||||||
# For the time being, let's assume the script will fail
|
# For the time being, let's assume the script will fail
|
||||||
echo "PROCEED=false" >> $GITHUB_ENV
|
echo "PROCEED=false" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
@ -70,7 +72,7 @@ for arch in ${architectures[@]}; do
|
||||||
tempdir="$(mktemp -d)"
|
tempdir="$(mktemp -d)"
|
||||||
|
|
||||||
# Download sources and calculate checksum
|
# Download sources and calculate checksum
|
||||||
filename=${asset_url##*/}
|
filename="asset-$arch.zip"
|
||||||
curl --silent -4 -L $asset_url -o "$tempdir/$filename"
|
curl --silent -4 -L $asset_url -o "$tempdir/$filename"
|
||||||
checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
|
checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
|
||||||
|
|
||||||
|
|
4
.github/workflows/updater.yml
vendored
4
.github/workflows/updater.yml
vendored
|
@ -14,7 +14,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Fetch the source code
|
- name: Fetch the source code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Run the updater script
|
- name: Run the updater script
|
||||||
|
@ -33,7 +33,7 @@ jobs:
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
id: cpr
|
id: cpr
|
||||||
if: ${{ env.PROCEED == 'true' }}
|
if: ${{ env.PROCEED == 'true' }}
|
||||||
uses: peter-evans/create-pull-request@v3
|
uses: peter-evans/create-pull-request@v4
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
commit-message: Update to version ${{ env.VERSION }}
|
commit-message: Update to version ${{ env.VERSION }}
|
||||||
|
|
|
@ -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
|
**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
|
**Demo:** http://distsn.org/pleroma-instances.html
|
||||||
|
|
||||||
|
|
|
@ -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
|
**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
|
**Démo :** http://distsn.org/pleroma-instances.html
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220705/artifacts/download?file_type=archive
|
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224375/artifacts/download?file_type=archive
|
||||||
SOURCE_SUM=8b4e2ab17362c7b0ed3ca685e19d578ad842ac00cde2db7d8c54dfd5a4e05891
|
SOURCE_SUM=6e2d055795f1f59bbdadf82bfd4ae291e89ac6a65a71091657359cd7eae783d4
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=zip
|
SOURCE_FORMAT=zip
|
||||||
SOURCE_IN_SUBDIR=true
|
SOURCE_IN_SUBDIR=true
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220709/artifacts/download?file_type=archive
|
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224379/artifacts/download?file_type=archive
|
||||||
SOURCE_SUM=e432310df95ae4d915a02082252df0346ca7e112ffa4484b6a05075778c71338
|
SOURCE_SUM=4c98198401787797681bbc755450a23eb8113420cd4f55f27b980d11378c884e
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=zip
|
SOURCE_FORMAT=zip
|
||||||
SOURCE_IN_SUBDIR=true
|
SOURCE_IN_SUBDIR=true
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/220707/artifacts/download?file_type=archive
|
SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/224377/artifacts/download?file_type=archive
|
||||||
SOURCE_SUM=c31dd8bb62728887cfe5488ef5818dc5e57e90f6443fbcfd501ea12044d0a94c
|
SOURCE_SUM=f64d43f86f962fa4a03a2a3108c0cf353ec8f80a5e8b59098470356048a6fdd0
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=zip
|
SOURCE_FORMAT=zip
|
||||||
SOURCE_IN_SUBDIR=true
|
SOURCE_IN_SUBDIR=true
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
"id": "pleroma",
|
"id": "pleroma",
|
||||||
"packaging_format": 1,
|
"packaging_format": 1,
|
||||||
"description": {
|
"description": {
|
||||||
"en": "A free, federated social networking server built on open protocols.",
|
"en": "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."
|
"fr": "Serveur de réseautage social fédéré basé sur des protocoles ouverts"
|
||||||
},
|
},
|
||||||
"version": "2.4.4~ynh2",
|
"version": "2.4.5~ynh1",
|
||||||
"url": "https://pleroma.social/",
|
"url": "https://pleroma.social/",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
"name": "registration",
|
"name": "registration",
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"ask": {
|
"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 ?"
|
"fr": "L'inscription doit-elle être ouverte aux utilisateurs qui n'ont pas de compte YunoHost sur le système ?"
|
||||||
},
|
},
|
||||||
"default": false
|
"default": false
|
||||||
|
|
Loading…
Add table
Reference in a new issue