YunoHost-Apps/spip_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/spip_ynh.git synced 2024-09-03 20:25:59 +02:00
Code Issues Activity Actions

Merge remote-tracking branch 'origin/testing' into upgrade

Browse source
This commit is contained in:
yalh76 2022-08-04 20:37:33 +02:00
commit c9fea0ffb4
5 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/updater.sh vendored
View file

@ -17,7 +17,7 @@
current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
repo=$(cat manifest.json | jq -j '.upstream.code|split("https://git.spip.net/")[1]') repo=$(cat manifest.json | jq -j '.upstream.code|split("https://git.spip.net/")[1]')
# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) # 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://git.spip.net/api/v1/repos/spip/spip/tags" | jq -r '.[] | .name' | sort -V | tail -1) version=$(curl --silent "https://git.spip.net/api/v1/repos/spip/spip/tags" | jq -r '.[] | .name' | grep -v "alpha" | grep -v "beta" | grep -v "rc" | sort -V | tail -1)
assets=("https://files.spip.net/spip/archives/spip-$version.zip") assets=("https://files.spip.net/spip/archives/spip-$version.zip")
# Later down the script, we assume the version has only digits and dots # Later down the script, we assume the version has only digits and dots
@ -27,11 +27,6 @@ if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
version=${version:1} version=${version:1}
fi fi
if [[ $version == *"-alpha" || $version == *"-beta" ]]; then
echo "::warning ::This is not a release version"
exit 0
fi
# Setting up the environment variables # Setting up the environment variables
echo "Current version: $current_version" echo "Current version: $current_version"
echo "Latest release from upstream: $version" echo "Latest release from upstream: $version"

23
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# SPIP for YunoHost # SPIP for YunoHost
[![Integration level](https://dash.yunohost.org/integration/spip.svg)](https://dash.yunohost.org/appci/app/spip) ![](https://ci-apps.yunohost.org/ci/badges/spip.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/spip.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/spip.svg)](https://dash.yunohost.org/appci/app/spip) ![Working status](https://ci-apps.yunohost.org/ci/badges/spip.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/spip.maintain.svg)
[![Install SPIP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=spip) [![Install SPIP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=spip)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
CMS with a focus on collaborative edition and multilingualism CMS with a focus on collaborative edition and multilingualism
**Shipped version:** 4.0.4~ynh1 **Shipped version:** 4.1.5~ynh1
**Demo:** https://demo.spip.net/ **Demo:** https://demo.spip.net/
## Screenshots ## Screenshots
![](./doc/screenshots/220px-Logo_SPIP.png) ![Screenshot of SPIP](./doc/screenshots/220px-Logo_SPIP.png)
## Disclaimers / important information ## Disclaimers / important information
@ -62,22 +62,23 @@ You should see that SPIP is installed after that.
## Documentation and resources ## Documentation and resources
* Official app website: http://www.spip.net/ * Official app website: <http://www.spip.net/>
* Official user documentation: https://www.spip.net/en_rubrique57.html * Official user documentation: <https://www.spip.net/en_rubrique57.html>
* Official admin documentation: https://www.spip.net/en_rubrique209.html * Official admin documentation: <https://www.spip.net/en_rubrique209.html>
* Upstream app code repository: https://git.spip.net/spip/spip * Upstream app code repository: <https://git.spip.net/spip/spip>
* YunoHost documentation for this app: https://yunohost.org/app_spip * YunoHost documentation for this app: <https://yunohost.org/app_spip>
* Report a bug: https://github.com/YunoHost-Apps/spip_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/spip_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/spip_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/spip_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug
or or
sudo yunohost app upgrade spip -u https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug sudo yunohost app upgrade spip -u https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

29
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# SPIP pour YunoHost # SPIP pour YunoHost
[![Niveau d'intégration](https://dash.yunohost.org/integration/spip.svg)](https://dash.yunohost.org/appci/app/spip) ![](https://ci-apps.yunohost.org/ci/badges/spip.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/spip.maintain.svg) [![Niveau d'intégration](https://dash.yunohost.org/integration/spip.svg)](https://dash.yunohost.org/appci/app/spip) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/spip.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/spip.maintain.svg)
[![Installer SPIP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=spip) [![Installer SPIP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=spip)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer SPIP rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer SPIP rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,13 +17,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
CMS conçu pour l'édition collaborative et le multilinguisme CMS conçu pour l'édition collaborative et le multilinguisme
**Version incluse :** 4.0.4~ynh1 **Version incluse :** 4.1.5~ynh1
**Démo :** https://demo.spip.net/ **Démo :** https://demo.spip.net/
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/220px-Logo_SPIP.png) ![Capture d'écran de SPIP](./doc/screenshots/220px-Logo_SPIP.png)
## Avertissements / informations importantes ## Avertissements / informations importantes
@ -55,22 +59,23 @@ Notez qu'une tâche cron sera exécutée après la fin de cette commande. Vous d
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://www.spip.net/ * Site officiel de l'app : <http://www.spip.net/>
* Documentation officielle utilisateur : https://www.spip.net/en_rubrique57.html * Documentation officielle utilisateur : <https://www.spip.net/en_rubrique57.html>
* Documentation officielle de l'admin : https://www.spip.net/en_rubrique209.html * Documentation officielle de l'admin : <https://www.spip.net/en_rubrique209.html>
* Dépôt de code officiel de l'app : https://git.spip.net/spip/spip * Dépôt de code officiel de l'app : <https://git.spip.net/spip/spip>
* Documentation YunoHost pour cette app : https://yunohost.org/app_spip * Documentation YunoHost pour cette app : <https://yunohost.org/app_spip>
* Signaler un bug : https://github.com/YunoHost-Apps/spip_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/spip_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/spip_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/spip_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade spip -u https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug sudo yunohost app upgrade spip -u https://github.com/YunoHost-Apps/spip_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://files.spip.net/spip/archives/spip-v4.0.4.zip SOURCE_URL=https://files.spip.net/spip/archives/spip-v4.1.5.zip
SOURCE_SUM=9450a3e0f09a805b450691ba361e5aedaf5fda88c5968d0d762505901c03634a SOURCE_SUM=ede38c530e459b63f083200eed2e7d385b67c5a08ec5abf73ae75acb9aca3ef6
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=false

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "CMS with a focus on collaborative edition and multilingualism", "en": "CMS with a focus on collaborative edition and multilingualism",
"fr": "CMS conçu pour l'édition collaborative et le multilinguisme" "fr": "CMS conçu pour l'édition collaborative et le multilinguisme"
}, },
"version": "4.0.4~ynh1", "version": "4.1.5~ynh1",
"url": "http://www.spip.net/", "url": "http://www.spip.net/",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",