Merge pull request #8 from YunoHost-Apps/testing

2024-09-03 18:06:27 +02:00 · 2022-09-06 08:51:05 +02:00 · 2022-09-06 08:51:05 +02:00 · b3c6b09ed7
commit b3c6b09ed7
parent 4a9e25900d 9dc355744a
6 changed files with 83 additions and 30 deletions
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@ -9,9 +9,6 @@
 # Since each app is different, maintainers can adapt its contents so as to perform
 # automatic actions when a new upstream release is detected.

-# Remove this exit command when you are ready to run this Action
-exit 1
-
 #=================================================
 # FETCHING LATEST RELEASE AND ITS ASSETS
 #=================================================
@ -19,6 +16,7 @@ exit 1
 # Fetching information
 current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
 repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
+echo "REPO=$repo" >> $GITHUB_ENV
 # 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://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
 assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'"))
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@ -0,0 +1,50 @@
+# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
+# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
+# This file should be enough by itself, but feel free to tune it to your needs.
+# It calls updater.sh, which is where you should put the app-specific update steps.
+name: Check for new upstream releases
+on:
+  # Allow to manually trigger the workflow
+  workflow_dispatch:
+  # Run it every day at 6:00 UTC
+  schedule:
+    - cron:  '0 6 * * *'
+jobs:
+  updater:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch the source code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run the updater script
+        id: run_updater
+        run: |
+          # Setting up Git user
+          git config --global user.name 'yunohost-bot'
+          git config --global user.email 'yunohost-bot@users.noreply.github.com'
+          # Run the updater script
+          /bin/bash .github/workflows/updater.sh
+      - name: Commit changes
+        id: commit
+        if: ${{ env.PROCEED == 'true' }}
+        run: |
+          git commit -am "Upgrade to v$VERSION"
+      - name: Create Pull Request
+        id: cpr
+        if: ${{ env.PROCEED == 'true' }}
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update to version ${{ env.VERSION }}
+          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
+          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
+          signoff: false
+          base: testing
+          branch: ci-auto-update-v${{ env.VERSION }}
+          delete-branch: true
+          title: 'Upgrade to version ${{ env.VERSION }}'
+          body: |
+            Upgrade to v${{ env.VERSION }}
+            [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }})
+          draft: false
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Bazarr for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/bazarr.svg)](https://dash.yunohost.org/appci/app/bazarr) ![](https://ci-apps.yunohost.org/ci/badges/bazarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/bazarr.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/bazarr.svg)](https://dash.yunohost.org/appci/app/bazarr) ![Working status](https://ci-apps.yunohost.org/ci/badges/bazarr.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/bazarr.maintain.svg)  
 [![Install Bazarr with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bazarr)

 *[Lire ce readme en français.](./README_fr.md)*
@ -24,13 +24,12 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download
 - Subtitles upgrade whenever better ones are released


-**Shipped version:** 1.0.1~ynh3
-
+**Shipped version:** 1.1.0~ynh1


 ## Screenshots

-![](./doc/screenshots/bazarr.png)
+![Screenshot of Bazarr](./doc/screenshots/bazarr.png)

 ## Disclaimers / important information

@ -39,21 +38,22 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download

 ## Documentation and resources

-* Official app website: https://bazarr.media
-* Official admin documentation: https://wiki.bazarr.media
-* Upstream app code repository: https://github.com/morpheus65535/bazarr
-* YunoHost documentation for this app: https://yunohost.org/app_bazarr
-* Report a bug: https://github.com/YunoHost-Apps/bazarr_ynh/issues
+* Official app website: <https://bazarr.media>
+* Official admin documentation: <https://wiki.bazarr.media>
+* Upstream app code repository: <https://github.com/morpheus65535/bazarr>
+* YunoHost documentation for this app: <https://yunohost.org/app_bazarr>
+* Report a bug: <https://github.com/YunoHost-Apps/bazarr_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/bazarr_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/bazarr_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade bazarr -u https://github.com/YunoHost-Apps/bazarr_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -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.
+-->
+
 # Bazarr pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/bazarr.svg)](https://dash.yunohost.org/appci/app/bazarr) ![](https://ci-apps.yunohost.org/ci/badges/bazarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/bazarr.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/bazarr.svg)](https://dash.yunohost.org/appci/app/bazarr) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/bazarr.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/bazarr.maintain.svg)  
 [![Installer Bazarr avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bazarr)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer Bazarr 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.*
@ -20,13 +24,12 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download
 - Subtitles upgrade whenever better ones are released


-**Version incluse :** 1.0.1~ynh3
-
+**Version incluse :** 1.1.0~ynh1


 ## Captures d'écran

-![](./doc/screenshots/bazarr.png)
+![Capture d'écran de Bazarr](./doc/screenshots/bazarr.png)

 ## Avertissements / informations importantes

@ -35,21 +38,22 @@ Bazarr is a companion application to Sonarr and Radarr that manages and download

 ## Documentations et ressources

-* Site officiel de l'app : https://bazarr.media
-* Documentation officielle de l'admin : https://wiki.bazarr.media
-* Dépôt de code officiel de l'app : https://github.com/morpheus65535/bazarr
-* Documentation YunoHost pour cette app : https://yunohost.org/app_bazarr
-* Signaler un bug : https://github.com/YunoHost-Apps/bazarr_ynh/issues
+* Site officiel de l'app : <https://bazarr.media>
+* Documentation officielle de l'admin : <https://wiki.bazarr.media>
+* Dépôt de code officiel de l'app : <https://github.com/morpheus65535/bazarr>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_bazarr>
+* Signaler un bug : <https://github.com/YunoHost-Apps/bazarr_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/bazarr_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/bazarr_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade bazarr -u https://github.com/YunoHost-Apps/bazarr_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>
--- a/7
+++ b/7
@ -15,7 +15,7 @@
 		setup_private=1
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=22445f018b70ed1a89593107afff498b672f93ad
+#		upgrade=1	from_commit=4a9e25900da812c232a19d90ce037d099d8417f5
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@ -24,6 +24,7 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=22445f018b70ed1a89593107afff498b672f93ad
-		name=2022-01-13 v1.0.1~ynh1
+# Disabled because YunoHost 11 does not ship python3.7 anymore
+	; commit=4a9e25900da812c232a19d90ce037d099d8417f5
+		name=2022-03-31 v1.0.1~ynh3
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Automated subtitle downloading for Sonarr and Radarr",
        "fr": "Téléchargement automatique de sous-titres pour Sonarr et Radarr"
    },
-    "version": "1.0.1~ynh3",
+    "version": "1.1.0~ynh1",
    "url": "https://bazarr.media",
    "upstream": {
        "license": "GPL-3.0",