Merge pull request #5 from YunoHost-Apps/testing

2024-09-03 19:35:58 +02:00 · 2022-10-27 22:41:39 +02:00 · 2022-10-27 22:41:39 +02:00 · a22468ceaa
commit a22468ceaa
parent cd2f91ab84 d486fbbbb4
11 changed files with 230 additions and 39 deletions
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@ -0,0 +1,135 @@
+#!/bin/bash
+
+#=================================================
+# PACKAGE UPDATING HELPER
+#=================================================
+
+# This script is meant to be run by GitHub Actions
+# The YunoHost-Apps organisation offers a template Action to run this script periodically
+# Since each app is different, maintainers can adapt its contents so as to perform
+# automatic actions when a new upstream release is detected.
+
+#=================================================
+# FETCHING LATEST RELEASE AND ITS ASSETS
+#=================================================
+
+# 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]')
+# 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 "'"))
+
+# Later down the script, we assume the version has only digits and dots
+# Sometimes the release name starts with a "v", so let's filter it out.
+# You may need more tweaks here if the upstream repository has different naming conventions. 
+if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
+    version=${version:1}
+fi
+
+# Setting up the environment variables
+echo "Current version: $current_version"
+echo "Latest release from upstream: $version"
+echo "VERSION=$version" >> $GITHUB_ENV
+# For the time being, let's assume the script will fail
+echo "PROCEED=false" >> $GITHUB_ENV
+
+# Proceed only if the retrieved version is greater than the current one
+if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
+    echo "::warning ::No new version available"
+    exit 0
+# Proceed only if a PR for this new version does not already exist
+elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
+    echo "::warning ::A branch already exists for this update"
+    exit 0
+fi
+
+# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.)
+echo "${#assets[@]} available asset(s)"
+
+#=================================================
+# UPDATE SOURCE FILES
+#=================================================
+
+# Here we use the $assets variable to get the resources published in the upstream release.
+# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like.
+
+# Let's loop over the array of assets URLs
+for asset_url in ${assets[@]}; do
+
+echo "Handling asset at $asset_url"
+
+# Assign the asset to a source file in conf/ directory
+# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
+# Leave $src empty to ignore the asset
+case $asset_url in
+  *"linux-core-arm.tar.gz")
+    src="armhf"
+    ;;
+  *"linux-core-arm64.tar.gz")
+    src="arm64"
+    ;;
+  *"linux-core-x64.tar.gz")
+    src="amd64"
+    ;;
+  *"linux-core-x86.tar.gz")
+    src="i386"
+    ;;
+  *)
+    src=""
+    ;;
+esac
+
+# If $src is not empty, let's process the asset
+if [ ! -z "$src" ]; then
+
+# Create the temporary directory
+tempdir="$(mktemp -d)"
+
+# Download sources and calculate checksum
+filename=${asset_url##*/}
+curl --silent -4 -L $asset_url -o "$tempdir/$filename"
+checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
+
+# Delete temporary directory
+rm -rf $tempdir
+
+extension=tar.gz
+
+# Rewrite source file
+cat <<EOT > conf/$src.src
+SOURCE_URL=$asset_url
+SOURCE_SUM=$checksum
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=$extension
+SOURCE_IN_SUBDIR=true
+SOURCE_EXTRACT=true
+SOURCE_FILENAME=lidarr.tar.gz
+EOT
+echo "... conf/$src.src updated"
+
+else
+echo "... asset ignored"
+fi
+
+done
+
+#=================================================
+# SPECIFIC UPDATE STEPS
+#=================================================
+
+# Any action on the app's source code can be done.
+# The GitHub Action workflow takes care of committing all changes after this script ends.
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+
+# Replace new version in manifest
+echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
+
+# No need to update the README, yunohost-bot takes care of it
+
+# The Action will proceed only if the PROCEED environment variable is set to true
+echo "PROCEED=true" >> $GITHUB_ENV
+exit 0
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@ -0,0 +1,49 @@
+# 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@v3
+        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@v4
+        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
+          branch: ci-auto-update-v${{ env.VERSION }}
+          base: testing
+          delete-branch: true
+          title: 'Upgrade to version ${{ env.VERSION }}'
+          body: |
+            Upgrade to v${{ env.VERSION }}
+          draft: false
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Lidarr for YunoHost

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

 *[Lire ce readme en français.](./README_fr.md)*
@ -17,13 +17,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 Music collection manager for Usenet and BitTorrent users

-**Shipped version:** 0.8.1.2135~ynh2
-
-
+**Shipped version:** 1.0.2.2592~ynh1

 ## Screenshots

-![](./doc/screenshots/screenshot.jpg)
+![Screenshot of Lidarr](./doc/screenshots/screenshot.jpg)

 ## Disclaimers / important information

@ -34,21 +32,22 @@ Music collection manager for Usenet and BitTorrent users

 ## Documentation and resources

-* Official app website: https://lidarr.audio
-* Official admin documentation: https://wiki.servarr.com/Lidarr
-* Upstream app code repository: https://github.com/Lidarr/Lidarr
-* YunoHost documentation for this app: https://yunohost.org/app_lidarr
-* Report a bug: https://github.com/YunoHost-Apps/lidarr_ynh/issues
+* Official app website: <https://lidarr.audio>
+* Official admin documentation: <https://wiki.servarr.com/Lidarr>
+* Upstream app code repository: <https://github.com/Lidarr/Lidarr>
+* YunoHost documentation for this app: <https://yunohost.org/app_lidarr>
+* Report a bug: <https://github.com/YunoHost-Apps/lidarr_ynh/issues>

 ## Developer info

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

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade lidarr -u https://github.com/YunoHost-Apps/lidarr_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.
+-->
+
 # Lidarr pour YunoHost

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

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

 > *Ce package vous permet d'installer Lidarr 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.*
@ -13,13 +17,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent

-**Version incluse :** 0.8.1.2135~ynh2
-
-
+**Version incluse :** 1.0.2.2592~ynh1

 ## Captures d'écran

-![](./doc/screenshots/screenshot.jpg)
+![Capture d'écran de Lidarr](./doc/screenshots/screenshot.jpg)

 ## Avertissements / informations importantes

@ -30,21 +32,22 @@ Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent

 ## Documentations et ressources

-* Site officiel de l'app : https://lidarr.audio
-* Documentation officielle de l'admin : https://wiki.servarr.com/Lidarr
-* Dépôt de code officiel de l'app : https://github.com/Lidarr/Lidarr
-* Documentation YunoHost pour cette app : https://yunohost.org/app_lidarr
-* Signaler un bug : https://github.com/YunoHost-Apps/lidarr_ynh/issues
+* Site officiel de l'app : <https://lidarr.audio>
+* Documentation officielle de l'admin : <https://wiki.servarr.com/Lidarr>
+* Dépôt de code officiel de l'app : <https://github.com/Lidarr/Lidarr>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_lidarr>
+* Signaler un bug : <https://github.com/YunoHost-Apps/lidarr_ynh/issues>

 ## Informations pour les développeurs

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

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade lidarr -u https://github.com/YunoHost-Apps/lidarr_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/6
+++ b/6
@ -11,7 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#upgrade=1	from_commit=CommitHash
+		upgrade=1	from_commit=cd2f91ab84cef8c143ee1f3f05c82691bce17726
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@ -20,5 +20,5 @@ Email=
 Notification=none
 ;;; Upgrade options
 	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
+		name=2021-12-02 v0.8.1.2135
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&
--- a/conf/amd64.src
+++ b/conf/amd64.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v0.8.1.2135/Lidarr.master.0.8.1.2135.linux-core-x64.tar.gz
-SOURCE_SUM=471b40109e115210f903805e791ffac39511b76bb4a856edea31c15dd2cd6787
+SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x64.tar.gz
+SOURCE_SUM=8ae236e204fbfd1159f7173872c77ecd61333d23ecc6a618e45fbbf085918f14
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/arm64.src
+++ b/conf/arm64.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v0.8.1.2135/Lidarr.master.0.8.1.2135.linux-core-arm64.tar.gz
-SOURCE_SUM=28140127f42f3814ea9a2602a054249257cf9d146ebd35b727fc2ceaf0a7b614
+SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm64.tar.gz
+SOURCE_SUM=c870286712de285ea6951fc0bf4107d0b8765eab8cf55c7a86e3434c4b38c325
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/armhf.src
+++ b/conf/armhf.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v0.8.1.2135/Lidarr.master.0.8.1.2135.linux-core-arm.tar.gz
-SOURCE_SUM=5c6aa066a581b9922aa3b8e2606d7107a1339d4527a3e50c47a8ec25bdba155f
+SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm.tar.gz
+SOURCE_SUM=dc59225da4490b40bea386d5ec5a305d43706447dbfea05f84505bc21b4425e5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/i386.src
+++ b/conf/i386.src
@ -0,0 +1,7 @@
+SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x86.tar.gz
+SOURCE_SUM=4e0a3828f9479c9b99210536903660839f38e5dd2764514d69b9661e0d087d00
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_EXTRACT=true
+SOURCE_FILENAME=lidarr.tar.gz
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Music collection manager for Usenet and BitTorrent users",
        "fr": "Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent"
    },
-    "version": "0.8.1.2135~ynh2",
+    "version": "1.0.2.2592~ynh1",
    "url": "https://lidarr.audio",
    "upstream": {
        "license": "GPL-3.0-only",
@ -14,7 +14,7 @@
        "admindoc": "https://wiki.servarr.com/Lidarr",
        "code": "https://github.com/Lidarr/Lidarr"
    },
-    "license": "MIT",
+    "license": "GPL-3.0-only",
    "maintainer": {
        "name": "tituspijean",
        "email": "tituspijean@outlook.com"
@ -29,7 +29,7 @@
        "mysql"
    ],
    "arguments": {
-        "install" : [
+        "install": [
            {
                "name": "domain",
                "type": "domain"
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,8 +4,6 @@
 # COMMON VARIABLES
 #=================================================

-version="0.8.1.2135"
-
 # dependencies used by the app
 pkg_dependencies="curl mediainfo sqlite3"