Merge pull request #26 from YunoHost-Apps/testing

Testing

.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@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 }}
+          draft: false

README.md

@@ -15,9 +15,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.
+Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams
 
-**Shipped version:** 15.6.8~ynh1
+**Shipped version:** 15.9.4~ynh1
 
 **Demo:** https://app.diagrams.net/
 

README_fr.md

@@ -11,9 +11,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Application en ligne qui permet de faire des schémas et du dessin vectoriel.
+Application en ligne qui permet de faire des schémas et du dessin vectoriel
 
-**Version incluse :** 15.6.8~ynh1
+**Version incluse :** 15.9.4~ynh1
 
 **Démo :** https://app.diagrams.net/
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/jgraph/drawio/archive/v15.6.8.tar.gz
-SOURCE_SUM=f8e73c988c8875ab8cd102ebacfa46b6267b9e77215a1cd6510fa1ee138d8293
+SOURCE_URL=https://github.com/jgraph/drawio/archive/v15.9.4.tar.gz
+SOURCE_SUM=fd46757f847929abae9b6b3092c21a4caf027895316a0d0bb1082381ed00cd7e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -6,11 +6,6 @@ location __PATH__/ {
   # See https://github.com/jgraph/drawio
   alias __FINALPATH__/src/main/webapp/;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
   #client_max_body_size 50M;
 

manifest.json

@@ -3,10 +3,10 @@
     "id": "diagramsnet",
     "packaging_format": 1,
     "description": {
-        "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.",
-        "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel."
+        "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams",
+        "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel"
     },
-    "version": "15.6.8~ynh1",
+    "version": "15.9.4~ynh1",
     "url": "https://www.diagrams.net/",
     "upstream": {
         "license": "Apache-2.0",
@@ -21,7 +21,7 @@
         "email": "gofannon@riseup.net"
     },
     "requirements": {
-        "yunohost": ">= 4.2.0"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [

scripts/restore

@@ -37,8 +37,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS