From 7fbe04e9559016f6eaadd29598b9031e4fb58370 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Nov 2021 23:49:20 +0100 Subject: [PATCH 1/5] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 4fc9a9a..53f57f0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "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", "url": "https://www.diagrams.net/", From 23eb3ac37d364df31c80e78d1c7a8b531b832ab8 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 14 Nov 2021 22:49:25 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b18f39b..7c39b83 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ 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 diff --git a/README_fr.md b/README_fr.md index 08b2474..a7b8d54 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ 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 From 9e519f34874fa8a085c02d57c4883a580a71c6b4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Dec 2021 10:07:49 +0100 Subject: [PATCH 3/5] 15.9.4 --- conf/app.src | 4 ++-- conf/nginx.conf | 5 ----- manifest.json | 4 ++-- scripts/restore | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/conf/app.src b/conf/app.src index fbbad2e..97415d1 100644 --- a/conf/app.src +++ b/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 diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ab44c7..77789de 100644 --- a/conf/nginx.conf +++ b/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; diff --git a/manifest.json b/manifest.json index 53f57f0..a6c2321 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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": [ diff --git a/scripts/restore b/scripts/restore index acf1d72..5c03f66 100644 --- a/scripts/restore +++ b/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 From 111e0c2abc60828c17f16e0a1eaca795fa1d960d Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 9 Dec 2021 09:07:56 +0000 Subject: [PATCH 4/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c39b83..f6bc2c9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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/ diff --git a/README_fr.md b/README_fr.md index a7b8d54..c11b095 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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/ From 8944131b5de78e088997265566b3926c7b3ab1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Dec 2021 10:08:19 +0100 Subject: [PATCH 5/5] Create updater.yml --- .github/workflows/updater.yml | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..fb72ba0 --- /dev/null +++ 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@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 ' + author: 'yunohost-bot ' + 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